diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java index d3515c18df5e..b9b71b69c60b 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java +++ b/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); diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java index 28c76e8f4f88..26b07f96483d 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java +++ b/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 deps = new TreeSet(pxm.getDirectDependencies()); diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java index 2802a246b168..bbd8ab206a6f 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java +++ b/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 context = new AtomicReference(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { context.set(new ProxyLookup(prepareData(), Lookups.fixed(new SubCategoryProvider(category, preselectedSubCategory)))); } diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java index 5a094d86662a..28c8dc81eef1 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java +++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/ClusterizeVisualPanel1.java @@ -29,7 +29,7 @@ final class ClusterizeVisualPanel1 extends JPanel { ClusterizeVisualPanel1(ClusterizeWizardPanel1 aThis) { panel = aThis; - handle = ProgressHandleFactory.createHandle(java.util.ResourceBundle.getBundle("org/netbeans/modules/apisupport/project/ui/customizer/Bundle").getString("MSG_ClusterizeScanning")); + handle = ProgressHandle.createHandle(java.util.ResourceBundle.getBundle("org/netbeans/modules/apisupport/project/ui/customizer/Bundle").getString("MSG_ClusterizeScanning")); initComponents(); progressPanel.add(BorderLayout.CENTER, ProgressHandleFactory.createProgressComponent(handle)); progressName.add(BorderLayout.CENTER, ProgressHandleFactory.createMainLabelComponent(handle)); diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java index f5a1037bed52..39e4892e967b 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java +++ b/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(); } diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java index 66d7e9a51f7d..74ce392fd1f2 100644 --- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java +++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java @@ -19,10 +19,8 @@ package org.netbeans.modules.apisupport.project.ui.wizard; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dialog; -import java.awt.GridBagConstraints; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -43,8 +41,6 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; @@ -53,7 +49,6 @@ import org.netbeans.api.annotations.common.CheckForNull; import org.netbeans.api.annotations.common.NullAllowed; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.ui.OpenProjects; @@ -199,7 +194,7 @@ static void deleteProject(final SuiteProject project, UserInputHandler handler) final Map> subModulesDataFiles = getSubModulesDataFiles(subModules); - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption")); final DefaultSuiteProjectDeletePanel deletePanel = new DefaultSuiteProjectDeletePanel(handle, displayName, FileUtil.getFileDisplayName(projectFolder), !subModulesDataFiles.isEmpty(), !subModules.isEmpty()); String caption = NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption"); diff --git a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java index c757a421c100..22878f994c0b 100644 --- a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java +++ b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java @@ -106,7 +106,7 @@ protected void readFromDataModel() { setError(ex.getMessage()); } if(task != null) { - handle = ProgressHandleFactory.createHandle(Bundle.MSG_LaunchingApplication()); + handle = ProgressHandle.createHandle(Bundle.MSG_LaunchingApplication()); JComponent pc = ProgressHandleFactory.createProgressComponent(handle); JLabel ml = ProgressHandleFactory.createMainLabelComponent(handle); diff --git a/apisupport/maven.apisupport/nbproject/project.xml b/apisupport/maven.apisupport/nbproject/project.xml index 8ff8317e5d7c..471af1f1937d 100644 --- a/apisupport/maven.apisupport/nbproject/project.xml +++ b/apisupport/maven.apisupport/nbproject/project.xml @@ -71,14 +71,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java index 5ca3bfd89dc1..dc264826f725 100644 --- a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java +++ b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java @@ -34,7 +34,6 @@ import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.apache.maven.project.MavenProject; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.modules.apisupport.project.spi.PlatformJarProvider; import org.netbeans.modules.maven.api.NbMavenProject; @@ -113,7 +112,7 @@ private void download(List arts, MavenEmbedder online, List selectedPlugins, bo uninstall ? "Uninstallation" : "Installation"); String message = NbBundle.getMessage(GrailsPluginSupport.class, uninstall ? "PluginUninstallPleaseWait" : "PluginInstallPleaseWait", plugin.getName()); - ProgressHandle handle = ProgressHandleFactory.createHandle(message); + ProgressHandle handle = ProgressHandle.createHandle(message); ProgressDialogDescriptor descriptor = ProgressSupport.createProgressDialog(title, handle, null); final Dialog dlg = DialogDisplayer.getDefault().createDialog(descriptor); diff --git a/contrib/j2ee.jboss4/nbproject/project.xml b/contrib/j2ee.jboss4/nbproject/project.xml index f9b04dc947b7..4f056666e479 100644 --- a/contrib/j2ee.jboss4/nbproject/project.xml +++ b/contrib/j2ee.jboss4/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.xml diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/nodes/actions/UndeployModuleCookieImpl.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/nodes/actions/UndeployModuleCookieImpl.java index 48d870e00c10..9175ff9f1cc7 100644 --- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/nodes/actions/UndeployModuleCookieImpl.java +++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/nodes/actions/UndeployModuleCookieImpl.java @@ -26,7 +26,6 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.j2ee.jboss4.JBDeploymentManager; import org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginProperties; import org.netbeans.modules.j2ee.jboss4.nodes.JBAbilitiesSupport; @@ -75,7 +74,7 @@ private UndeployModuleCookieImpl(String fileName, ModuleType type, boolean isEJB public Task undeploy() { final JBDeploymentManager dm = (JBDeploymentManager) lookup.lookup(JBDeploymentManager.class); final String nameWoExt = fileName.substring(0, fileName.lastIndexOf('.')); - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(UndeployModuleCookieImpl.class, + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(UndeployModuleCookieImpl.class, "LBL_UndeployProgress", nameWoExt)); Runnable r = new Runnable() { diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/design/ConfigRunnable.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/design/ConfigRunnable.java index 263b65d0f250..f30f9e886ee4 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/design/ConfigRunnable.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/design/ConfigRunnable.java @@ -30,7 +30,7 @@ */ public class ConfigRunnable implements Runnable { - private ProgressHandle progressHandle = ProgressHandleFactory.createHandle(null); + private ProgressHandle progressHandle = ProgressHandle.createHandle(null); final ProgressPanel progressPanel = new ProgressPanel( NbBundle.getMessage(MtomConfiguration.class, "LBL_Wait")); //NOI18N diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wizard/STSWizardCreator.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wizard/STSWizardCreator.java index 3a182920228d..d19f3bb7963e 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wizard/STSWizardCreator.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wizard/STSWizardCreator.java @@ -45,10 +45,8 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.TreeUtilities; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; @@ -109,7 +107,7 @@ public STSWizardCreator(Project project) { } public void createSTS() { - final ProgressHandle handle = ProgressHandleFactory.createHandle( + final ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(STSWizardCreator.class, "TXT_StsGeneration")); //NOI18N initProjectInfo(project); diff --git a/enterprise/glassfish.common/nbproject/project.xml b/enterprise/glassfish.common/nbproject/project.xml index 76d6b945c65e..9092bd155290 100644 --- a/enterprise/glassfish.common/nbproject/project.xml +++ b/enterprise/glassfish.common/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.db diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java index b4fe2daa3885..2b6b955169cc 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java @@ -33,7 +33,6 @@ import java.util.logging.Level; import javax.swing.SwingUtilities; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.glassfish.spi.ExecSupport; import org.netbeans.modules.glassfish.spi.GlassfishModule; import org.netbeans.modules.glassfish.spi.ServerUtilities; @@ -158,7 +157,7 @@ public void run() { ExecSupport ee = new ExecSupport(); process = Runtime.getRuntime().exec(arrnd, null, irf); pdcan = new PDCancel(process, domainDir + File.separator + domain); - ph = ProgressHandleFactory.createHandle( + ph = ProgressHandle.createHandle( NbBundle.getMessage(this.getClass(), "LBL_Creating_personal_domain"), // NOI18N pdcan); ph.start(); diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ProgressUI.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ProgressUI.java index 51f845368ffe..1b41d928a2af 100644 --- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ProgressUI.java +++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/ProgressUI.java @@ -78,7 +78,7 @@ public ProgressUI(String title, boolean modal, Deployment.Logger logger) { this.modal = modal; this.title = title; this.logger = logger; - handle = ProgressHandleFactory.createHandle(title); + handle = ProgressHandle.createHandle(title); } public void start() { diff --git a/enterprise/javaee.wildfly/nbproject/project.xml b/enterprise/javaee.wildfly/nbproject/project.xml index 7557008a303f..86efebb88681 100644 --- a/enterprise/javaee.wildfly/nbproject/project.xml +++ b/enterprise/javaee.wildfly/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.xml diff --git a/enterprise/maven.j2ee/nbproject/project.xml b/enterprise/maven.j2ee/nbproject/project.xml index cf72801a24bd..e80abfd1f122 100644 --- a/enterprise/maven.j2ee/nbproject/project.xml +++ b/enterprise/maven.j2ee/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/customizer/impl/CustomizerFrameworks.java b/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/customizer/impl/CustomizerFrameworks.java index f9e6a0f2ad6f..6f1aa56346f1 100644 --- a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/customizer/impl/CustomizerFrameworks.java +++ b/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 { diff --git a/enterprise/maven.jaxws/nbproject/project.xml b/enterprise/maven.jaxws/nbproject/project.xml index 5309f332c49c..52009126ce02 100644 --- a/enterprise/maven.jaxws/nbproject/project.xml +++ b/enterprise/maven.jaxws/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.web.webmodule diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java index 61718c225677..25ef26f1f57b 100644 --- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java +++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/actions/AddWsOperationHelper.java @@ -70,7 +70,6 @@ import static org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory; //import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; @@ -167,7 +166,7 @@ protected void okButtonPressed(MethodModel method, FileObject implClassFo, Strin */ private void addOperation(final MethodModel methodModel, final FileObject implClassFo) { final JavaSource targetSource = JavaSource.forFileObject(implClassFo); - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(AddWsOperationHelper.class, "MSG_AddingNewOperation", methodModel.getName())); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(AddWsOperationHelper.class, "MSG_AddingNewOperation", methodModel.getName())); handle.start(100); final String[] seiClass = new String[1]; final CancellableTask modificationTask = new CancellableTask() { diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/nodes/ClientHandlerButtonListener.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/nodes/ClientHandlerButtonListener.java index 90bf268f656c..5e2ed52335dc 100644 --- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/nodes/ClientHandlerButtonListener.java +++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/nodes/ClientHandlerButtonListener.java @@ -37,7 +37,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.URI; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Collections; @@ -53,7 +52,6 @@ import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; @@ -133,7 +131,7 @@ private void configureHandler() { if (!panel.isChanged()) { return; } - ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(ClientHandlerButtonListener.class, "MSG_ConfigureHandler")); //NOI18N + ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(ClientHandlerButtonListener.class, "MSG_ConfigureHandler")); //NOI18N handle.start(); handle.switchToIndeterminate(); JAXWSLightSupport support = node.getLookup().lookup(JAXWSLightSupport.class); diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsClientCreator.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsClientCreator.java index 75bae39d298d..1fed807cf671 100644 --- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsClientCreator.java +++ b/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() ){ diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java index 018d36e17547..dfd67ffa3c9e 100644 --- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java +++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java @@ -63,7 +63,6 @@ import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.j2ee.api.ejbjar.EjbReference; import org.netbeans.modules.j2ee.core.api.support.classpath.ContainerClassPathModifier; import org.netbeans.modules.maven.jaxws.MavenJAXWSSupportImpl; @@ -137,7 +136,7 @@ public void createService() throws IOException { serviceType = ((Integer) wiz.getProperty(WizardProperties.WEB_SERVICE_TYPE)); // Use Progress API to display generator messages. - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N handle.start(100); Runnable r = new Runnable() { @@ -168,7 +167,7 @@ public void createServiceFromWsdl() throws IOException { //initProjectInfo(project); - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N Runnable r = new Runnable() { diff --git a/enterprise/payara.common/nbproject/project.xml b/enterprise/payara.common/nbproject/project.xml index 4c818828e096..7b6a8bc53521 100644 --- a/enterprise/payara.common/nbproject/project.xml +++ b/enterprise/payara.common/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.db diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java index cc6554ac0b4d..6d6ca82c29e5 100644 --- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java +++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java @@ -38,7 +38,6 @@ import java.util.logging.Level; import javax.swing.SwingUtilities; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.payara.spi.ExecSupport; import org.netbeans.modules.payara.spi.ServerUtilities; import org.openide.DialogDisplayer; @@ -169,7 +168,7 @@ public void run() { ExecSupport ee = new ExecSupport(); process = Runtime.getRuntime().exec(args.toArray(new String[0]), null, irf); pdcan = new PDCancel(process, domainDir + File.separator + domain); - ph = ProgressHandleFactory.createHandle( + ph = ProgressHandle.createHandle( NbBundle.getMessage(this.getClass(), "LBL_Creating_personal_domain"), // NOI18N pdcan); ph.start(); diff --git a/enterprise/web.core.syntax/nbproject/project.xml b/enterprise/web.core.syntax/nbproject/project.xml index af066fff73c3..0869c0cf2a6d 100644 --- a/enterprise/web.core.syntax/nbproject/project.xml +++ b/enterprise/web.core.syntax/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.web.webmodule diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspHyperlinkProvider.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspHyperlinkProvider.java index f17567b42ac1..87c9f87a399a 100644 --- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspHyperlinkProvider.java +++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspHyperlinkProvider.java @@ -41,7 +41,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 +422,7 @@ public TypeElement process(CompilationInfo info) { } }); - ProgressUtils.runOffEventDispatchThread(compute, + BaseProgressUtils.runOffEventDispatchThread(compute, NbBundle.getMessage(JspHyperlinkProvider.class, "MSG_goto-source"), cancel, false); diff --git a/enterprise/web.el/nbproject/project.xml b/enterprise/web.el/nbproject/project.xml index 9573023341a8..ebe0c293b76a 100644 --- a/enterprise/web.el/nbproject/project.xml +++ b/enterprise/web.el/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.web.webmodule diff --git a/enterprise/web.el/src/org/netbeans/modules/web/el/navigation/ELHyperlinkProvider.java b/enterprise/web.el/src/org/netbeans/modules/web/el/navigation/ELHyperlinkProvider.java index ad760d7e6ff6..ca46365d37d1 100644 --- a/enterprise/web.el/src/org/netbeans/modules/web/el/navigation/ELHyperlinkProvider.java +++ b/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); diff --git a/enterprise/web.jsf.editor/nbproject/project.xml b/enterprise/web.jsf.editor/nbproject/project.xml index f11c256a0956..ea6ff4f55bec 100644 --- a/enterprise/web.jsf.editor/nbproject/project.xml +++ b/enterprise/web.jsf.editor/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.web.webmodule diff --git a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/actions/FixNamespacesAction.java b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/actions/FixNamespacesAction.java index fb6c6e975032..b7d23f23648a 100644 --- a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/actions/FixNamespacesAction.java +++ b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/actions/FixNamespacesAction.java @@ -31,10 +31,12 @@ import javax.swing.SwingUtilities; import javax.swing.text.JTextComponent; import org.netbeans.api.editor.EditorActionRegistration; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; + import static org.netbeans.editor.BaseAction.MAGIC_POSITION_RESET; import static org.netbeans.editor.BaseAction.UNDO_MERGE_RESET; + import org.netbeans.modules.html.editor.api.HtmlKit; import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult; import org.netbeans.modules.parsing.api.ParserManager; @@ -111,7 +113,7 @@ public void run(ResultIterator ri) throws Exception { } }; - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java index f11adefa6185..4da12805c29c 100644 --- a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java +++ b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java @@ -43,7 +43,6 @@ import java.util.stream.Collectors; import javax.servlet.ServletContext; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.web.jsf.api.editor.JsfFacesComponentsProvider; import org.netbeans.modules.web.jsf.editor.JsfSupportImpl; import org.netbeans.modules.web.jsf.editor.facelets.mojarra.ConfigManager; @@ -262,7 +261,7 @@ private void updateFacesComponentLibraries(Map faceletsLibrarie //handle progress private Map findLibraries() { - ProgressHandle progress = ProgressHandleFactory.createHandle( + ProgressHandle progress = ProgressHandle.createHandle( NbBundle.getMessage(FaceletsLibrarySupport.class, "MSG_ParsingFaceletsLibraries")); //NOI18N progress.start(); progress.switchToIndeterminate(); diff --git a/enterprise/web.jsf.navigation/nbproject/project.xml b/enterprise/web.jsf.navigation/nbproject/project.xml index 53d4a70c3d65..1694e2b52934 100644 --- a/enterprise/web.jsf.navigation/nbproject/project.xml +++ b/enterprise/web.jsf.navigation/nbproject/project.xml @@ -34,14 +34,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.visual diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowController.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowController.java index a2de5c9f208d..ce94e5d9fc01 100644 --- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowController.java +++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowController.java @@ -50,7 +50,7 @@ import java.util.prefs.Preferences; import javax.swing.JButton; import javax.swing.JEditorPane; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.web.api.webmodule.WebModule; import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigComponent; import org.openide.DialogDescriptor; @@ -119,7 +119,7 @@ private Collection setupWebFiles(FileObject webFolder) { // with the page flow editor, and this is probably not the best place for this code. // but in any case this should be a pretty safe fix). AtomicBoolean canceled = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowElement.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowElement.java index a8fa9dcec405..3de641981573 100644 --- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowElement.java +++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowElement.java @@ -27,7 +27,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.JComponent; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.core.spi.multiview.CloseOperationState; import org.netbeans.core.spi.multiview.MultiViewElement; import org.netbeans.core.spi.multiview.MultiViewElementCallback; @@ -138,7 +138,7 @@ public void componentClosed() { final FileObject storageFile = PageFlowView.getStorageFile(context.getFacesConfigFile()); if (storageFile != null && storageFile.isValid()) { - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { long time = System.currentTimeMillis(); diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java index d4266d1cd7d4..efe936b3c329 100644 --- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java +++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/PageFlowView.java @@ -40,7 +40,6 @@ import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; @@ -255,7 +254,7 @@ public void setScene(PageFlowScene scene) { "PageFlowView.lbl.graph.initialization=Initializing PageFlow Graph" }) private synchronized void processScene() { - final ProgressHandle progressHandle = ProgressHandleFactory.createHandle(Bundle.PageFlowView_lbl_graph_initialization()); + final ProgressHandle progressHandle = ProgressHandle.createHandle(Bundle.PageFlowView_lbl_graph_initialization()); progressHandle.start(); initTask = RP.submit(new Runnable() { @Override diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/PaletteUtils.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/PaletteUtils.java index b22b320c31a2..6f8a9416c045 100644 --- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/PaletteUtils.java +++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/PaletteUtils.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import javax.swing.text.JTextComponent; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.parsing.api.ParserManager; import org.netbeans.modules.parsing.api.ResultIterator; import org.netbeans.modules.parsing.api.Source; @@ -57,7 +57,7 @@ protected static String createViewTag(JsfLibrariesSupport jls, JTextComponent jt protected static JsfLibrariesSupport getJsfLibrariesSupport(JTextComponent targetComponent) { AtomicBoolean cancel = new AtomicBoolean(); JsfLibrariesGetter jsfLibrariesGetter = new JsfLibrariesGetter(targetComponent, cancel); - ProgressUtils.runOffEventDispatchThread(jsfLibrariesGetter, Bundle.PaletteUtils_lbl_preparing_palette_component(), cancel, false, 100, 3000); + BaseProgressUtils.runOffEventDispatchThread(jsfLibrariesGetter, Bundle.PaletteUtils_lbl_preparing_palette_component(), cancel, false, 100, 3000); return jsfLibrariesGetter.getJsfLibrariesSupport(); } diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java index f1403f5175ad..b6f66a89440a 100644 --- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java +++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientIterator.java @@ -39,6 +39,7 @@ import org.netbeans.api.java.project.classpath.ProjectClassPathModifier; import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; @@ -166,10 +167,11 @@ public Set instantiate(TemplateWizard wizard) throws IOException final JpaControllerUtil.EmbeddedPkSupport embeddedPkSupport = new JpaControllerUtil.EmbeddedPkSupport(); final String title = NbBundle.getMessage(PersistenceClientIterator.class, "TITLE_Progress_Jsf_Pages"); //NOI18N - final ProgressContributor progressContributor = AggregateProgressFactory.createProgressContributor(title); + final ProgressContributor progressContributor = BasicAggregateProgressFactory.createProgressContributor(title); final AggregateProgressHandle handle = - AggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); + BasicAggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); final ProgressPanel progressPanel = new ProgressPanel(); + // TODO last usage of org.netbeans.api.progress.nb final JComponent progressComponent = AggregateProgressFactory.createProgressComponent(handle); final ProgressReporter reporter = new ProgressReporterDelegate( diff --git a/enterprise/web.project/nbproject/project.xml b/enterprise/web.project/nbproject/project.xml index 31ed601cd37e..ec905bb7eebe 100644 --- a/enterprise/web.project/nbproject/project.xml +++ b/enterprise/web.project/nbproject/project.xml @@ -86,14 +86,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.search diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java index e0e46b53c95a..5dc8775dc836 100644 --- a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java +++ b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java @@ -70,7 +70,7 @@ import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException; import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule; import org.netbeans.api.j2ee.core.Profile; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.javaee.project.api.ant.ui.customizer.LicensePanelSupport; import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider; import org.netbeans.modules.java.api.common.SourceRoots; @@ -1062,7 +1062,7 @@ private void handleExtenders(final List newExtenders, final List1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.web.webmodule diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java index 30f7a024344b..52b8ebfca9b6 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/AddWsOperationHelper.java @@ -39,7 +39,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.EnumSet; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -72,7 +71,6 @@ import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.java.source.ui.ScanDialog; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.j2ee.api.ejbjar.EjbJar; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizer; import org.netbeans.modules.j2ee.core.api.support.java.method.MethodCustomizerFactory; @@ -178,7 +176,7 @@ private void addOperation(final MethodModel methodModel, final FileObject implClassFo) { final JavaSource targetSource = JavaSource.forFileObject(implClassFo); - final ProgressHandle handle = ProgressHandleFactory.createHandle( + final ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(AddWsOperationHelper.class, "MSG_AddingNewOperation", methodModel.getName())); // NOI18N handle.start(100); diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java index 7fcfff85573b..dc292724822a 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/ClientInfo.java @@ -37,7 +37,6 @@ import java.net.ProxySelector; import java.net.URL; import java.net.URLDecoder; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; @@ -75,8 +74,7 @@ import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.queries.SourceLevelQuery; -import org.netbeans.api.options.OptionsDisplayer; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; @@ -576,7 +574,7 @@ public void run() { } }; - ProgressUtils.showProgressDialogAndRun( runnable, + BaseProgressUtils.showProgressDialogAndRun( runnable, NbBundle.getMessage(ClientInfo.class, "TXT_SaasWait")); // NOI18N } diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/JaxWsClientCreator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/JaxWsClientCreator.java index add143480f98..99bd108b58d5 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/JaxWsClientCreator.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/JaxWsClientCreator.java @@ -32,7 +32,6 @@ import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.queries.UnitTestForSourceQuery; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; @@ -83,7 +82,7 @@ public void createClient() throws IOException { //final boolean isJWSDPSupported = isJWSDPSupported(); // Use Progress API to display generator messages. - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(JaxWsClientCreator.class, "MSG_WizCreateClient")); //NOI18N + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(JaxWsClientCreator.class, "MSG_WizCreateClient")); //NOI18N task = new Task(new Runnable() { public void run() { diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java index 54e297e30cfe..3a9669a013d0 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java @@ -63,7 +63,6 @@ import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.ui.ScanDialog; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ProjectUtils; @@ -123,7 +122,7 @@ public void createService() throws IOException { projectType = projectInfo.getProjectType(); // Use Progress API to display generator messages. - final ProgressHandle handle = ProgressHandleFactory.createHandle( + final ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N handle.start(100); @@ -156,7 +155,7 @@ public void createServiceFromWsdl() throws IOException { //initProjectInfo(project); - final ProgressHandle handle = ProgressHandleFactory.createHandle( + final ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(JaxWsServiceCreator.class, "TXT_WebServiceGeneration")); //NOI18N diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsCodeGenerator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsCodeGenerator.java index 4272533b00d6..de2043e272fc 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsCodeGenerator.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/actions/JaxWsCodeGenerator.java @@ -44,7 +44,7 @@ import org.netbeans.modules.websvc.api.support.InvokeOperationCookie; import org.openide.util.Lookup; import static org.netbeans.api.java.source.JavaSource.Phase; -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.editor.BaseDocument; @@ -523,7 +523,7 @@ public void run() { doInsertMethod(document, pos, operationNode); } }; - ProgressUtils.showProgressDialogAndRun(runnable, + BaseProgressUtils.showProgressDialogAndRun(runnable, NbBundle.getMessage(JaxWsCodeGenerator.class, "MSG_GenerateMethod", operation.getName())); // NOI18N } diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ClientHandlerButtonListener.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ClientHandlerButtonListener.java index 1fe4c740a5c8..4e99bb9a71ae 100644 --- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ClientHandlerButtonListener.java +++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/ClientHandlerButtonListener.java @@ -37,7 +37,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.URI; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.List; @@ -56,7 +55,6 @@ import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; @@ -136,7 +134,7 @@ private void configureHandler() { if (!panel.isChanged()) { return; } - ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(ClientHandlerButtonListener.class, "MSG_ConfigureHandler")); //NOI18N + ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(ClientHandlerButtonListener.class, "MSG_ConfigureHandler")); //NOI18N handle.start(); handle.switchToIndeterminate(); FileObject srcRoot = (FileObject) node.getLookup().lookup(FileObject.class); diff --git a/enterprise/websvc.customization/nbproject/project.xml b/enterprise/websvc.customization/nbproject/project.xml index 3f0ac04fcfcb..0c1232de278a 100644 --- a/enterprise/websvc.customization/nbproject/project.xml +++ b/enterprise/websvc.customization/nbproject/project.xml @@ -34,14 +34,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.projectapi diff --git a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/core/ui/CustomizationWSEditor.java b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/core/ui/CustomizationWSEditor.java index 055a780fa6ba..92e8d8200cf4 100644 --- a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/core/ui/CustomizationWSEditor.java +++ b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/core/ui/CustomizationWSEditor.java @@ -35,10 +35,8 @@ import javax.swing.JComponent; import javax.swing.undo.UndoManager; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientSupport; import org.netbeans.modules.websvc.api.wseditor.InvalidDataException; -import org.netbeans.modules.websvc.api.wseditor.InvalidDataException; import org.netbeans.modules.websvc.api.wseditor.WSEditor; import org.netbeans.modules.websvc.customization.multiview.WSCustomizationTopComponent; import org.netbeans.modules.websvc.jaxws.api.JAXWSSupport; @@ -115,7 +113,7 @@ private void saveAndRefresh(final Node node, JaxWsModel jaxWsModel) { if (jaxwsDirty) { jaxWsModel.write(); } - final ProgressHandle handle = ProgressHandleFactory.createHandle + final ProgressHandle handle = ProgressHandle.createHandle (NbBundle.getMessage(CustomizationWSEditor.class, "TXT_Refreshing")); //NOI18N handle.start(100); handle.switchToIndeterminate(); diff --git a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/light/CustomizationWSEditor.java b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/light/CustomizationWSEditor.java index 99ffeaf12d63..66b4f5f4bb9b 100644 --- a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/light/CustomizationWSEditor.java +++ b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/light/CustomizationWSEditor.java @@ -38,7 +38,6 @@ import javax.swing.JComponent; import javax.swing.undo.UndoManager; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.websvc.api.support.RefreshCookie; import org.netbeans.modules.websvc.api.wseditor.InvalidDataException; import org.netbeans.modules.websvc.api.wseditor.WSEditor; @@ -110,7 +109,7 @@ private void saveAndRefresh(final Node node) { } } } - final ProgressHandle handle = ProgressHandleFactory.createHandle + final ProgressHandle handle = ProgressHandle.createHandle (NbBundle.getMessage(CustomizationWSEditor.class, "TXT_Refreshing")); //NOI18N handle.start(100); handle.switchToIndeterminate(); diff --git a/enterprise/websvc.design/nbproject/project.xml b/enterprise/websvc.design/nbproject/project.xml index 57f388d67657..f828a696dfa3 100644 --- a/enterprise/websvc.design/nbproject/project.xml +++ b/enterprise/websvc.design/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.visual diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/actions/RemoveOperationAction.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/actions/RemoveOperationAction.java index 8c1699279c43..2a33113fcb34 100644 --- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/actions/RemoveOperationAction.java +++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/actions/RemoveOperationAction.java @@ -37,12 +37,10 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; -import org.netbeans.modules.websvc.api.jaxws.project.config.Service; import org.netbeans.modules.websvc.core.MethodGenerator; import org.netbeans.modules.websvc.design.javamodel.MethodModel; import org.netbeans.modules.websvc.design.javamodel.ProjectService; @@ -88,7 +86,7 @@ public void actionPerformed(ActionEvent arg0) { (singleSelection?"MSG_OPERATION_DELETE":"MSG_OPERATIONS_DELETE"), methodName)); Object retVal = DialogDisplayer.getDefault().notify(desc); if (retVal == NotifyDescriptor.YES_OPTION) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle. + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle. getMessage(RemoveOperationAction.class, (singleSelection?"MSG_RemoveOperation":"MSG_RemoveOperations"), methodName)); //NOI18N Task task = new Task(new Runnable() { diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/ClientJavaSourceHelper.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/ClientJavaSourceHelper.java index 23bcc21ef81c..4542cd416bcc 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/ClientJavaSourceHelper.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/ClientJavaSourceHelper.java @@ -40,13 +40,11 @@ import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.editor.GuardedException; import org.netbeans.modules.j2ee.dd.api.web.DDProvider; import org.netbeans.modules.j2ee.dd.api.web.Servlet; -import org.netbeans.modules.j2ee.dd.api.web.ServletMapping; import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25; import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException; @@ -163,7 +161,7 @@ public static void generateJerseyClient(Node resourceNode, * is based on JAX-RS 2.0 which is not supported by Java EE 6.... */ try { - handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(ClientJavaSourceHelper.class, "MSG_creatingRESTClient")); + handle = ProgressHandle.createHandle(NbBundle.getMessage(ClientJavaSourceHelper.class, "MSG_creatingRESTClient")); handle.start(); // add REST and Jersey dependencies if (!jaxRs2Available && !jaxRs1Available && !jakartaRsClientAvailable) { diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/OpenCookieFactory.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/OpenCookieFactory.java index 1969838e46ca..c3f428190b9f 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/OpenCookieFactory.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/OpenCookieFactory.java @@ -25,7 +25,7 @@ import javax.swing.SwingUtilities; import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.Project; import org.netbeans.modules.websvc.rest.support.JavaSourceHelper; import org.netbeans.modules.websvc.rest.support.SourceGroupSupport; @@ -68,7 +68,7 @@ public OpenCookieImpl(Project project, String className, String methodName) { public void open() { if ( SwingUtilities.isEventDispatchThread()){ final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { doOpen(); diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/Utils.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/Utils.java index 9a0d5154504f..bd78c967ba7b 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/Utils.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/Utils.java @@ -37,7 +37,7 @@ import javax.swing.SwingUtilities; import org.apache.tools.ant.module.api.support.ActionUtils; import org.netbeans.api.java.source.JavaSource; -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.ProjectUtils; @@ -210,7 +210,7 @@ private static void generateRemoteTester( final Project restProject, Project rem if ( SwingUtilities.isEventDispatchThread() ){ final FileObject[] testFO = new FileObject[1]; AtomicBoolean cancel = new AtomicBoolean(false); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { @@ -275,7 +275,7 @@ private static void generateLocalTester(final Project prj ) { if ( SwingUtilities.isEventDispatchThread() ){ final Properties props[] = new Properties[1]; AtomicBoolean cancel = new AtomicBoolean(false); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { @@ -327,7 +327,7 @@ public void run() { if ( SwingUtilities.isEventDispatchThread() ){ final FileObject[] testFO = new FileObject[1]; AtomicBoolean cancel = new AtomicBoolean(false); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/ProgressDialog.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/ProgressDialog.java index 40c433932b45..67ca9791fd68 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/ProgressDialog.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/ProgressDialog.java @@ -76,7 +76,7 @@ public ProgressHandle getProgressHandle() { } private void createDialog(String title) { - pHandle = ProgressHandleFactory.createHandle(title); + pHandle = ProgressHandle.createHandle(title); JPanel panel = new ProgressPanel(pHandle); DialogDescriptor descriptor = new DialogDescriptor( diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/DatabaseResourceWizardIterator.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/DatabaseResourceWizardIterator.java index 8ab2e49ca295..ba87b653c6f0 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/DatabaseResourceWizardIterator.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/DatabaseResourceWizardIterator.java @@ -37,6 +37,7 @@ import org.netbeans.api.java.source.Task; import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.api.project.Project; import org.netbeans.api.project.SourceGroup; @@ -144,7 +145,7 @@ public Set instantiate() throws IOException { final String title = NbBundle.getMessage(RelatedCMPWizard.class, "TXT_EntityClassesGeneration"); final ProgressContributor progressContributor = AggregateProgressFactory.createProgressContributor(title); final AggregateProgressHandle aggregateHandle = - AggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); + BasicAggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); progressPanel = new ProgressPanel(); final JComponent progressComponent = AggregateProgressFactory.createProgressComponent(aggregateHandle); diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/EnableStep.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/EnableStep.java index 1dd7a9c7c1b5..c29dc6040d0f 100644 --- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/EnableStep.java +++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/EnableStep.java @@ -86,7 +86,7 @@ public void run () { doEnableRunning = true; FindComponentModules find = new FindComponentModules(info); ModulesActivator activator = new ModulesActivator(forEnable, find); - ProgressHandle enableHandle = ProgressHandleFactory.createHandle ( + ProgressHandle enableHandle = ProgressHandle.createHandle ( getBundle ("ModulesStep_Enable", presentElementsForEnable (find))); JComponent enableComponent = ProgressHandleFactory.createProgressComponent (enableHandle); diff --git a/groovy/groovy.editor/nbproject/project.xml b/groovy/groovy.editor/nbproject/project.xml index 15a4adf66d66..6147199985aa 100644 --- a/groovy/groovy.editor/nbproject/project.xml +++ b/groovy/groovy.editor/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.multiview diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java index ffd906894ed8..a3bf7d81e064 100644 --- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java +++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/imports/ImportHelper.java @@ -35,7 +35,6 @@ import javax.lang.model.element.TypeElement; import javax.swing.Icon; import javax.swing.text.BadLocationException; -import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.source.ClassIndex; import org.netbeans.api.java.source.ClassIndex.NameKind; @@ -43,7 +42,7 @@ import org.netbeans.api.java.source.ElementHandle; import org.netbeans.api.java.source.ui.ElementIcons; 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.modules.csl.api.EditList; @@ -125,7 +124,7 @@ public static void resolveImports( if (!singleCandidates.isEmpty()) { Collections.sort(singleCandidates); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { diff --git a/ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysis.java b/ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysis.java index 681e18245dbb..2c619ff00ec0 100644 --- a/ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysis.java +++ b/ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysis.java @@ -44,7 +44,6 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.classpath.GlobalPathRegistry; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.modules.analysis.RunAnalysisPanel.DialogState; @@ -90,7 +89,7 @@ public static void showDialogAndRunAnalysis() { "BN_Cancel=Cancel", "TL_Inspect=Inspect"}) public static void showDialogAndRunAnalysis(final Lookup context, DialogState startingState) { - final ProgressHandle progress = ProgressHandleFactory.createHandle("Analyzing...", null, null); + final ProgressHandle progress = ProgressHandle.createHandle("Analyzing...", null, null); final JButton runAnalysis = new JButton(Bundle.BN_Inspect()); final RunAnalysisPanel rap = new RunAnalysisPanel(progress, context, runAnalysis, startingState); JButton cancel = new JButton(Bundle.BN_Cancel()); diff --git a/ide/code.analysis/test/unit/src/org/netbeans/modules/analysis/spi/AnalyzerTest.java b/ide/code.analysis/test/unit/src/org/netbeans/modules/analysis/spi/AnalyzerTest.java index 27c7b401f1e8..d8500b97d374 100644 --- a/ide/code.analysis/test/unit/src/org/netbeans/modules/analysis/spi/AnalyzerTest.java +++ b/ide/code.analysis/test/unit/src/org/netbeans/modules/analysis/spi/AnalyzerTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.analysis.spi.Analyzer.Context; /** @@ -31,7 +30,7 @@ public class AnalyzerTest { @Test public void testZeroWorkUnits() { - ProgressHandle handle = ProgressHandleFactory.createHandle("test"); + ProgressHandle handle = ProgressHandle.createHandle("test"); handle.start(1000); Context ctxInit = new Context(null, null, null, handle, 0, 100); diff --git a/ide/css.prep/nbproject/project.xml b/ide/css.prep/nbproject/project.xml index f55d66086a92..ae91eb730f77 100644 --- a/ide/css.prep/nbproject/project.xml +++ b/ide/css.prep/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/ide/db.core/nbproject/project.xml b/ide/db.core/nbproject/project.xml index f8bd47cf3890..815a7043064d 100644 --- a/ide/db.core/nbproject/project.xml +++ b/ide/db.core/nbproject/project.xml @@ -34,14 +34,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.multiview diff --git a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java index 046d80b37e9d..ed73dfafa05f 100644 --- a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java +++ b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java @@ -38,7 +38,6 @@ import org.netbeans.api.db.explorer.ConnectionManager; import org.netbeans.api.db.explorer.DatabaseConnection; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.core.api.multiview.MultiViews; import org.netbeans.modules.db.api.sql.execute.SQLExecuteCookie; import org.netbeans.modules.db.api.sql.execute.SQLExecution; @@ -565,7 +564,7 @@ public Void run() throws Exception { return; } - ProgressHandle handle = ProgressHandleFactory.createHandle( + ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(SQLEditorSupport.class, "LBL_ExecutingStatements"), this); handle.start(); diff --git a/ide/db.dataview/nbproject/project.xml b/ide/db.dataview/nbproject/project.xml index ae6ff64736c8..29d64b1eb8e1 100644 --- a/ide/db.dataview/nbproject/project.xml +++ b/ide/db.dataview/nbproject/project.xml @@ -42,14 +42,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.commons_compress diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java index 21cade01fbde..4ca06cf9e90a 100644 --- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java +++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementExecutor.java @@ -21,7 +21,6 @@ import java.sql.Connection; import java.sql.SQLException; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.db.dataview.meta.DBConnectionFactory; import org.netbeans.modules.db.dataview.meta.DBException; import org.openide.DialogDisplayer; @@ -70,7 +69,7 @@ public void run() { assert task != null; try { startTime = System.currentTimeMillis(); - ProgressHandle handle = ProgressHandleFactory.createHandle(title, this); + ProgressHandle handle = ProgressHandle.createHandle(title, this); handle.setDisplayName(titleMsg); handle.start(); try { diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BlobFieldTableCellEditor.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BlobFieldTableCellEditor.java index a43bd931cdde..90db2e6d83c8 100644 --- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BlobFieldTableCellEditor.java +++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/BlobFieldTableCellEditor.java @@ -39,7 +39,7 @@ import javax.imageio.stream.ImageInputStream; import javax.swing.*; import javax.swing.table.TableCellEditor; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.db.dataview.util.CharsetSelector; import org.netbeans.modules.db.dataview.util.EncodingHelper; import org.netbeans.modules.db.dataview.util.FileBackedBlob; @@ -266,7 +266,7 @@ private boolean doTransfer(InputStream is, OutputStream os, Integer size, String Throwable t; // Only show dialog, if the filesize is large enougth and has a use for the user if (size == null || size > (1024 * 1024)) { - t = ProgressUtils.showProgressDialogAndRun(ft, title, false); + t = BaseProgressUtils.showProgressDialogAndRun(ft, title, false); } else { t = ft.run(null); } diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java index c48148c31822..07d0a74bd210 100644 --- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java +++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/celleditor/ClobFieldTableCellEditor.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; import javax.swing.*; import javax.swing.table.TableCellEditor; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.db.dataview.util.FileBackedClob; import org.netbeans.modules.db.dataview.util.LobHelper; import org.openide.DialogDisplayer; @@ -269,7 +269,7 @@ private boolean doTransfer(Reader in, Writer out, Integer size, String title, bo Throwable t; // Only show dialog, if the filesize is large enougth and has a use for the user if (size == null || size > (1024 * 1024)) { - t = ProgressUtils.showProgressDialogAndRun(ft, title, false); + t = BaseProgressUtils.showProgressDialogAndRun(ft, title, false); } else { t = ft.run(null); } diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLDatabaseServer.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLDatabaseServer.java index 6ba3c293258d..8c84f13666d6 100644 --- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLDatabaseServer.java +++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLDatabaseServer.java @@ -51,7 +51,6 @@ import org.netbeans.api.db.explorer.DatabaseException; import org.netbeans.api.db.sql.support.SQLIdentifiers.Quoter; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.db.mysql.Database; import org.netbeans.modules.db.mysql.DatabaseServer; import org.netbeans.modules.db.mysql.DatabaseUser; @@ -529,7 +528,7 @@ public void execute() throws Exception { checkConfiguration(); - ProgressHandle progress = ProgressHandleFactory.createHandle( + ProgressHandle progress = ProgressHandle.createHandle( Utils.getMessage("MSG_ConnectingToServer")); try { @@ -1077,7 +1076,7 @@ private class StopDatabaseCommand extends DatabaseCommand implements Cancellable @Override public void execute() throws Exception { - ProgressHandle handle = ProgressHandleFactory.createHandle(Utils.getMessage("LBL_StoppingMySQLServer"), this); + ProgressHandle handle = ProgressHandle.createHandle(Utils.getMessage("LBL_StoppingMySQLServer"), this); try { handle.start(); handle.switchToIndeterminate(); diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StartManager.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StartManager.java index 46df5b353f26..e1a9596fd9cb 100644 --- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StartManager.java +++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StartManager.java @@ -28,7 +28,6 @@ import javax.swing.JButton; import org.netbeans.api.db.explorer.DatabaseException; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.db.mysql.DatabaseServer; import org.netbeans.modules.db.mysql.ui.PropertiesDialog; import org.netbeans.modules.db.mysql.util.DatabaseUtils; @@ -111,7 +110,7 @@ private void waitForStartAndConnect() { RequestProcessor.getDefault().post(new Runnable() { @Override public void run() { - ProgressHandle handle = ProgressHandleFactory.createHandle( + ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(StartManager.class, "MSG_WaitingForServerToStart")); handle.start(); handle.switchToIndeterminate(); diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StopManager.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StopManager.java index e74a049bf76e..e23034978ca0 100644 --- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StopManager.java +++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/StopManager.java @@ -30,7 +30,6 @@ import org.netbeans.api.db.explorer.DatabaseConnection; import org.netbeans.api.db.explorer.DatabaseException; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.db.mysql.DatabaseServer; import org.netbeans.modules.db.mysql.ui.PropertiesDialog; import org.netbeans.modules.db.mysql.ui.PropertiesDialog.Tab; @@ -121,7 +120,7 @@ private void disconnectAndWaitForStop() { RequestProcessor.getDefault().post(new Runnable() { @Override public void run() { - ProgressHandle handle = ProgressHandleFactory.createHandle( + ProgressHandle handle = ProgressHandle.createHandle( NbBundle.getMessage(StopManager.class, "MSG_WaitingForServerToStop")); handle.start(); handle.switchToIndeterminate(); diff --git a/ide/db/src/org/netbeans/modules/db/explorer/DbUtilities.java b/ide/db/src/org/netbeans/modules/db/explorer/DbUtilities.java index 8e4b4c853184..7edfd86ed30f 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/DbUtilities.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/DbUtilities.java @@ -73,7 +73,7 @@ public static T doWithProgress(String message, final Callable r final ProgressPanel panel = new ProgressPanel(); panel.setCancelVisible(false); panel.setText(message); - ProgressHandle handle = ProgressHandleFactory.createHandle(null); + ProgressHandle handle = ProgressHandle.createHandle(null); JComponent progress = ProgressHandleFactory.createProgressComponent(handle); handle.start(); final List result = new ArrayList(1); diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java index 1de1fbdb1214..efbf5bad7d9d 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java @@ -621,7 +621,7 @@ private void startProgress() { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - progressHandle = ProgressHandleFactory.createHandle(null); + progressHandle = ProgressHandle.createHandle(null); progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressContainerPanel.add(progressComponent, BorderLayout.CENTER); progressHandle.start(); diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectPanel.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectPanel.java index 67f492ad1ee2..e0cc2726a695 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectPanel.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectPanel.java @@ -233,7 +233,7 @@ private void startProgress() { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - progressHandle = ProgressHandleFactory.createHandle(null); + progressHandle = ProgressHandle.createHandle(null); progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressContainerPanel.add(progressComponent, BorderLayout.CENTER); progressHandle.start(); diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/NewConnectionPanel.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/NewConnectionPanel.java index 996722a95332..ccd359521d14 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/NewConnectionPanel.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/NewConnectionPanel.java @@ -55,7 +55,6 @@ import org.netbeans.api.db.explorer.JDBCDriver; import org.netbeans.api.db.explorer.JDBCDriverManager; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.db.util.DatabaseExplorerInternalUIs; import org.netbeans.modules.db.util.JdbcUrl; import org.netbeans.modules.db.util.PropertyEditorPanel; @@ -883,7 +882,7 @@ private void startProgress() { @Override public void run() { - progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(NewConnectionPanel.class, "ConnectionProgress_Connecting")); + progressHandle = ProgressHandle.createHandle(NbBundle.getMessage(NewConnectionPanel.class, "ConnectionProgress_Connecting")); progressHandle.start(); enableInput(false); } diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/SchemaPanel.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/SchemaPanel.java index a7dc10afae8c..803b8816b20b 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/SchemaPanel.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/SchemaPanel.java @@ -230,7 +230,7 @@ private void startProgress() { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - progressHandle = ProgressHandleFactory.createHandle(null); + progressHandle = ProgressHandle.createHandle(null); progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressContainerPanel.add(progressComponent, BorderLayout.CENTER); progressHandle.start(); diff --git a/ide/derby/src/org/netbeans/modules/derby/RegisterDerby.java b/ide/derby/src/org/netbeans/modules/derby/RegisterDerby.java index a4440a01eb9f..d97d64a29661 100644 --- a/ide/derby/src/org/netbeans/modules/derby/RegisterDerby.java +++ b/ide/derby/src/org/netbeans/modules/derby/RegisterDerby.java @@ -32,10 +32,7 @@ import org.netbeans.api.db.explorer.ConnectionManager; import org.netbeans.api.db.explorer.DatabaseConnection; import org.netbeans.api.db.explorer.DatabaseException; -import org.netbeans.api.db.explorer.JDBCDriver; -import org.netbeans.api.db.explorer.JDBCDriverManager; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.derby.api.DerbyDatabases; import org.netbeans.modules.derby.ui.SecurityManagerBugPanel; import org.netbeans.spi.db.explorer.DatabaseRuntime; @@ -214,7 +211,7 @@ public void run () { return; } - ProgressHandle ph = ProgressHandleFactory.createHandle(NbBundle.getMessage( + ProgressHandle ph = ProgressHandle.createHandle(NbBundle.getMessage( RegisterDerby.class, "MSG_CreatingDBProgressLabel", databaseName)); ph.start(); try { @@ -425,7 +422,7 @@ private boolean waitStart(final ExecSupport execSupport, int waitTime) { boolean started = false; final boolean[] forceExit = new boolean[1]; String waitMessage = NbBundle.getMessage(RegisterDerby.class, "MSG_StartingDerby"); - ProgressHandle progress = ProgressHandleFactory.createHandle(waitMessage, new Cancellable() { + ProgressHandle progress = ProgressHandle.createHandle(waitMessage, new Cancellable() { @Override public boolean cancel() { forceExit[0] = true; diff --git a/ide/docker.ui/nbproject/project.xml b/ide/docker.ui/nbproject/project.xml index 3af5979b5c2a..b163a35f9faa 100644 --- a/ide/docker.ui/nbproject/project.xml +++ b/ide/docker.ui/nbproject/project.xml @@ -43,14 +43,6 @@ 1.47 - - org.netbeans.api.progress.nb - - - - 1.47 - - org.netbeans.api.templates diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java b/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java index 7424b7bf6405..986afc4128fc 100644 --- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java +++ b/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildTask.java @@ -20,7 +20,6 @@ import java.awt.Color; import java.awt.event.ActionEvent; -import java.io.File; import java.io.IOException; import java.lang.ref.WeakReference; import java.util.Map; @@ -30,7 +29,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.docker.api.BuildEvent; import org.netbeans.modules.docker.api.DockerAction; import org.netbeans.modules.docker.api.DockerImage; @@ -38,7 +36,6 @@ import org.netbeans.modules.docker.ui.output.StatusOutputListener; import org.openide.filesystems.FileObject; import org.openide.util.Cancellable; -import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.windows.FoldHandle; import org.openide.windows.IOColorLines; @@ -140,7 +137,7 @@ public void run() { final FutureTask task = facade.createBuildTask(buildContext, dockerfile, buildargs, repository, tag, pull, noCache, new ListenerImpl(io), new StatusOutputListener(io)); hook.onStart(task); - ProgressHandle handle = ProgressHandleFactory.createHandle(Bundle.MSG_Building(buildContext), new Cancellable() { + ProgressHandle handle = ProgressHandle.createHandle(Bundle.MSG_Building(buildContext), new Cancellable() { @Override public boolean cancel() { return task.cancel(true); diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java b/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java index 7800f60a27ed..2f478242f349 100644 --- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java +++ b/ide/docker.ui/src/org/netbeans/modules/docker/ui/node/PushTagAction.java @@ -25,7 +25,6 @@ import javax.swing.AbstractAction; import javax.swing.SwingUtilities; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.docker.api.Credentials; import org.netbeans.modules.docker.api.DockerTag; import org.netbeans.modules.docker.api.DockerAction; @@ -121,7 +120,7 @@ public Push(DockerTag tag) { public void run() { String image = tag.getTag(); final InputOutput io = IOProvider.getDefault().getIO(Bundle.MSG_Pushing(image), false); - ProgressHandle handle = ProgressHandleFactory.createHandle(Bundle.MSG_Pushing(image), new AbstractAction() { + ProgressHandle handle = ProgressHandle.createHandle(Bundle.MSG_Pushing(image), null, new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { io.select(); diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java b/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java index d1a6d1372276..66798d0ed4f1 100644 --- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java +++ b/ide/docker.ui/src/org/netbeans/modules/docker/ui/pull/PullImageAction.java @@ -28,7 +28,6 @@ import javax.swing.JButton; import javax.swing.SwingUtilities; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.docker.api.Credentials; import org.netbeans.modules.docker.api.DockerInstance; import org.netbeans.modules.docker.api.DockerException; @@ -143,7 +142,7 @@ public Pull(DockerInstance instance, String image) { @Override public void run() { final InputOutput io = IOProvider.getDefault().getIO(Bundle.MSG_Pulling(image), false); - ProgressHandle handle = ProgressHandleFactory.createHandle(Bundle.MSG_Pulling(image), new AbstractAction() { + ProgressHandle handle = ProgressHandle.createHandle(Bundle.MSG_Pulling(image), null, new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { io.select(); diff --git a/ide/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java b/ide/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java index 18a9901129ab..93ec6b9e5f09 100644 --- a/ide/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java +++ b/ide/editor.global.format/src/org/netbeans/modules/editor/global/format/GlobalFormatAction.java @@ -46,7 +46,6 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.classpath.GlobalPathRegistry; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; @@ -98,7 +97,7 @@ public GlobalFormatAction() { public void actionPerformed(ActionEvent e) { final JButton ok = new JButton(Bundle.BTN_OK()); JButton cancelButton = new JButton(Bundle.BTN_Cancel()); - final ProgressHandle handle = ProgressHandleFactory.createHandle("Format"); + final ProgressHandle handle = ProgressHandle.createHandle("Format"); final ConfirmationPanel panel = new ConfirmationPanel(handle); DialogDescriptor nd = new DialogDescriptor(panel, Bundle.CAP_Reformat(), true, new Object[] {ok, cancelButton}, ok, DialogDescriptor.DEFAULT_ALIGN, null, new ActionListener() { @Override public void actionPerformed(ActionEvent e) {} diff --git a/ide/editor.lib/nbproject/project.xml b/ide/editor.lib/nbproject/project.xml index 12270518ce8f..59f7da76a672 100644 --- a/ide/editor.lib/nbproject/project.xml +++ b/ide/editor.lib/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.editor.document diff --git a/ide/editor.lib/src/org/netbeans/editor/ActionFactory.java b/ide/editor.lib/src/org/netbeans/editor/ActionFactory.java index 9bdffeb37431..1f7837377354 100644 --- a/ide/editor.lib/src/org/netbeans/editor/ActionFactory.java +++ b/ide/editor.lib/src/org/netbeans/editor/ActionFactory.java @@ -70,13 +70,13 @@ import org.netbeans.api.editor.caret.EditorCaret; import org.netbeans.api.editor.fold.FoldHierarchy; import org.netbeans.api.lexer.TokenHierarchy; -import org.netbeans.api.progress.ProgressUtils; import org.netbeans.lib.editor.util.swing.DocumentUtilities; import org.netbeans.lib.editor.util.swing.PositionRegion; import org.netbeans.modules.editor.indent.api.Indent; import org.netbeans.modules.editor.indent.api.Reformat; import org.netbeans.api.editor.NavigationHistory; import org.netbeans.api.editor.caret.CaretMoveContext; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.spi.editor.caret.CaretMoveHandler; import org.netbeans.modules.editor.lib2.RectangularSelectionUtils; import org.netbeans.modules.editor.lib2.view.DocumentView; @@ -1826,7 +1826,7 @@ public void actionPerformed (final ActionEvent evt, final JTextComponent target) try { final AtomicBoolean canceled = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { if (canceled.get()) return; final Reformat formatter = indentOnly ? null : Reformat.get(doc); diff --git a/ide/editor/nbproject/project.xml b/ide/editor/nbproject/project.xml index 75bd1c8abe54..5e4c2b37fc27 100644 --- a/ide/editor/nbproject/project.xml +++ b/ide/editor/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.editor.document diff --git a/ide/editor/src/org/netbeans/modules/editor/codegen/NbGenerateCodeAction.java b/ide/editor/src/org/netbeans/modules/editor/codegen/NbGenerateCodeAction.java index 430039414387..98bb0d657303 100644 --- a/ide/editor/src/org/netbeans/modules/editor/codegen/NbGenerateCodeAction.java +++ b/ide/editor/src/org/netbeans/modules/editor/codegen/NbGenerateCodeAction.java @@ -37,7 +37,7 @@ import javax.swing.text.JTextComponent; import org.netbeans.api.editor.EditorActionRegistration; import org.netbeans.api.editor.mimelookup.MimeLookup; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.ext.ExtKit; import org.netbeans.spi.editor.codegen.CodeGenerator; @@ -66,7 +66,7 @@ public NbGenerateCodeAction(){ public void actionPerformed(ActionEvent evt, final JTextComponent target) { final Task task = new Task(getFullMimePath(target.getDocument(), target.getCaretPosition())); final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { if (cancel != null && cancel.get()) diff --git a/ide/git/src/org/netbeans/modules/git/client/GitProgressSupport.java b/ide/git/src/org/netbeans/modules/git/client/GitProgressSupport.java index a80bbeb32d4c..fea3b220ffe4 100644 --- a/ide/git/src/org/netbeans/modules/git/client/GitProgressSupport.java +++ b/ide/git/src/org/netbeans/modules/git/client/GitProgressSupport.java @@ -189,9 +189,9 @@ protected ProgressHandle getProgressHandle () { if (progressHandle == null) { Action openAction = getLogger().getOpenOutputAction(); if (openAction == null) { - progressHandle = ProgressHandleFactory.createHandle(displayName, this); + progressHandle = ProgressHandle.createHandle(displayName, this); } else { - progressHandle = ProgressHandleFactory.createHandle(displayName, this, openAction); + progressHandle = ProgressHandle.createHandle(displayName, this, openAction); } } return progressHandle; diff --git a/ide/git/src/org/netbeans/modules/git/ui/actions/GitAction.java b/ide/git/src/org/netbeans/modules/git/ui/actions/GitAction.java index e35accb51cc2..f562cb986e94 100644 --- a/ide/git/src/org/netbeans/modules/git/ui/actions/GitAction.java +++ b/ide/git/src/org/netbeans/modules/git/ui/actions/GitAction.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.Project; import org.netbeans.api.project.ui.OpenProjects; import org.netbeans.modules.git.utils.GitUtils; @@ -100,7 +100,7 @@ public void run () { } } }; - ProgressUtils.runOffEventDispatchThread(run, Bundle.MSG_GitAction_savingFiles_progress(), canceled, false); + BaseProgressUtils.runOffEventDispatchThread(run, Bundle.MSG_GitAction_savingFiles_progress(), canceled, false); } protected abstract void performContextAction(Node[] nodes); diff --git a/ide/git/src/org/netbeans/modules/git/ui/checkout/SwitchBranchAction.java b/ide/git/src/org/netbeans/modules/git/ui/checkout/SwitchBranchAction.java index e607841659bb..96d2067f904a 100644 --- a/ide/git/src/org/netbeans/modules/git/ui/checkout/SwitchBranchAction.java +++ b/ide/git/src/org/netbeans/modules/git/ui/checkout/SwitchBranchAction.java @@ -25,7 +25,7 @@ import java.util.AbstractMap; import java.util.concurrent.atomic.AtomicBoolean; import javax.swing.AbstractAction; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.libs.git.GitBranch; import org.netbeans.modules.git.ui.repository.RepositoryInfo; import org.netbeans.modules.git.ui.repository.RevisionDialogController; @@ -129,7 +129,7 @@ public void run () { } } }; - ProgressUtils.runOffEventDispatchThread(run, Bundle.MSG_GitAction_savingFiles_progress(), canceled, false); + BaseProgressUtils.runOffEventDispatchThread(run, Bundle.MSG_GitAction_savingFiles_progress(), canceled, false); } } } diff --git a/ide/gsf.testrunner.ui/nbproject/project.xml b/ide/gsf.testrunner.ui/nbproject/project.xml index 1fd2cb0553f6..8144d1a038b7 100644 --- a/ide/gsf.testrunner.ui/nbproject/project.xml +++ b/ide/gsf.testrunner.ui/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.diff diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodDebuggerAction.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodDebuggerAction.java index a5a887032ef2..3fd07b99bea4 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodDebuggerAction.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodDebuggerAction.java @@ -20,9 +20,7 @@ import java.util.Collection; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodDebuggerProvider; -import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodRunnerProvider; import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; @@ -31,7 +29,6 @@ import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.Lookup; -import org.openide.util.Mutex; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; import org.openide.util.TaskListener; @@ -88,7 +85,7 @@ public void run() { } } }); - final ProgressHandle ph = ProgressHandleFactory.createHandle(Bundle.Search_For_Provider(), debugMethodTask); + final ProgressHandle ph = ProgressHandle.createHandle(Bundle.Search_For_Provider(), debugMethodTask); debugMethodTask.addTaskListener(new TaskListener() { @Override public void taskFinished(org.openide.util.Task task) { diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodRunnerAction.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodRunnerAction.java index 6dbd832661bb..1ca2423fbdcd 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodRunnerAction.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodRunnerAction.java @@ -20,7 +20,6 @@ import java.util.Collection; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodRunnerProvider; import org.netbeans.modules.parsing.api.indexing.IndexingManager; import org.openide.awt.ActionID; @@ -86,7 +85,7 @@ public void run() { } } }); - final ProgressHandle ph = ProgressHandleFactory.createHandle(Bundle.Search_For_Provider(), runMethodTask); + final ProgressHandle ph = ProgressHandle.createHandle(Bundle.Search_For_Provider(), runMethodTask); runMethodTask.addTaskListener(new TaskListener() { @Override public void taskFinished(org.openide.util.Task task) { diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodDebuggerProvider.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodDebuggerProvider.java index ceec54d76c08..8e4490260eec 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodDebuggerProvider.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodDebuggerProvider.java @@ -22,7 +22,6 @@ import javax.swing.JEditorPane; import javax.swing.text.Document; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.gsf.testrunner.api.CommonUtils; import org.netbeans.spi.project.ActionProvider; import org.netbeans.spi.project.SingleMethod; @@ -111,7 +110,7 @@ public void run() { singleMethod = TestMethodRunnerProvider.findTestMethod(doc, caret, TestMethodDebuggerProvider.this::getTestMethod); } }); - final ProgressHandle ph = ProgressHandleFactory.createHandle(Bundle.Search_For_Test_Method(), singleMethodTask); + final ProgressHandle ph = ProgressHandle.createHandle(Bundle.Search_For_Test_Method(), singleMethodTask); singleMethodTask.addTaskListener(new TaskListener() { @Override public void taskFinished(org.openide.util.Task task) { diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodRunnerProvider.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodRunnerProvider.java index edfd2a2a1a8e..896566aed450 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodRunnerProvider.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodRunnerProvider.java @@ -24,7 +24,6 @@ import javax.swing.JEditorPane; import javax.swing.text.Document; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.gsf.testrunner.api.CommonUtils; import org.netbeans.modules.gsf.testrunner.ui.annotation.TestMethodAnnotation; import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodController.TestMethod; @@ -118,7 +117,7 @@ public void run() { singleMethod = findTestMethod(doc, caret, TestMethodRunnerProvider.this::getTestMethod); } }); - final ProgressHandle ph = ProgressHandleFactory.createHandle(Bundle.Search_For_Test_Method(), singleMethodTask); + final ProgressHandle ph = ProgressHandle.createHandle(Bundle.Search_For_Test_Method(), singleMethodTask); singleMethodTask.addTaskListener(new TaskListener() { @Override public void taskFinished(org.openide.util.Task task) { diff --git a/ide/html.validation/nbproject/project.xml b/ide/html.validation/nbproject/project.xml index cec40f438dd4..44680f51f1c4 100644 --- a/ide/html.validation/nbproject/project.xml +++ b/ide/html.validation/nbproject/project.xml @@ -38,14 +38,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.html.editor.lib diff --git a/ide/html.validation/src/org/netbeans/modules/html/validation/NbValidationTransaction.java b/ide/html.validation/src/org/netbeans/modules/html/validation/NbValidationTransaction.java index 4cba2995d106..0c14eae9b368 100644 --- a/ide/html.validation/src/org/netbeans/modules/html/validation/NbValidationTransaction.java +++ b/ide/html.validation/src/org/netbeans/modules/html/validation/NbValidationTransaction.java @@ -51,7 +51,6 @@ import nu.validator.xml.dataattributes.DataAttributeDroppingSchemaWrapper; import nu.validator.xml.langattributes.XmlLangAttributeDroppingSchemaWrapper; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.html.editor.lib.api.HtmlVersion; import org.netbeans.modules.html.editor.lib.api.ProblemDescription; import org.openide.util.NbBundle; @@ -149,7 +148,7 @@ private static synchronized void initialize() { return; } - ProgressHandle progress = ProgressHandleFactory.createHandle(NbBundle.getMessage(NbValidationTransaction.class, "MSG_InitHTMLValidation")); //NOI18N + ProgressHandle progress = ProgressHandle.createHandle(NbBundle.getMessage(NbValidationTransaction.class, "MSG_InitHTMLValidation")); //NOI18N progress.start(); progress.switchToIndeterminate(); diff --git a/ide/hudson.ui/nbproject/project.xml b/ide/hudson.ui/nbproject/project.xml index 7c2c2590c9e1..38fd76ba76b6 100644 --- a/ide/hudson.ui/nbproject/project.xml +++ b/ide/hudson.ui/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.ide diff --git a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java index 168a62155e78..86c87b063072 100644 --- a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java +++ b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/actions/AddTestInstanceAction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import javax.swing.AbstractAction; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.hudson.api.ConnectionBuilder; import org.netbeans.modules.hudson.api.HudsonManager; import org.netbeans.modules.hudson.ui.api.UI; @@ -89,7 +88,7 @@ public void run() { return; } final AtomicBoolean cancelled = new AtomicBoolean(); - ProgressHandle progress = ProgressHandleFactory.createHandle( + ProgressHandle progress = ProgressHandle.createHandle( Bundle.AddTestInstanceAction_starting(), new Cancellable() { @Override public boolean cancel() { diff --git a/ide/hudson/nbproject/project.xml b/ide/hudson/nbproject/project.xml index 368dd7aa934f..008e00dd503e 100644 --- a/ide/hudson/nbproject/project.xml +++ b/ide/hudson/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.commons_net diff --git a/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonInstanceImpl.java b/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonInstanceImpl.java index a0658d3b4b6c..18c116c58d18 100644 --- a/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonInstanceImpl.java +++ b/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonInstanceImpl.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import java.util.prefs.Preferences; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.hudson.api.ConnectionBuilder; import org.netbeans.modules.hudson.api.HudsonChangeListener; import org.netbeans.modules.hudson.api.HudsonFolder; @@ -309,7 +308,7 @@ private void doSynchronize(final boolean authentication, final boolean showProgress) { final AtomicReference synchThread = new AtomicReference(); final AtomicReference handle = new AtomicReference(); - ProgressHandle handleObject = ProgressHandleFactory.createHandle( + ProgressHandle handleObject = ProgressHandle.createHandle( Bundle.MSG_Synchronizing(getName()), new Cancellable() { @Override diff --git a/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonJobImpl.java b/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonJobImpl.java index 686029294037..8da042f0d9cf 100644 --- a/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonJobImpl.java +++ b/ide/hudson/src/org/netbeans/modules/hudson/impl/HudsonJobImpl.java @@ -26,7 +26,6 @@ import java.util.List; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.hudson.api.HudsonJob; import org.netbeans.modules.hudson.api.HudsonJobBuild; import org.netbeans.modules.hudson.api.HudsonView; @@ -121,7 +120,7 @@ void addView(HudsonView view) { @Messages({"# {0} - job name", "MSG_Starting=Starting {0}"}) @Override public void start() { - ProgressHandle handle = ProgressHandleFactory.createHandle( + ProgressHandle handle = ProgressHandle.createHandle( MSG_Starting(this.getName())); handle.start(); try { diff --git a/ide/image/nbproject/project.xml b/ide/image/nbproject/project.xml index d28259eb491b..4c37b8011898 100644 --- a/ide/image/nbproject/project.xml +++ b/ide/image/nbproject/project.xml @@ -34,14 +34,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.spi.navigator diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/HgProgressSupport.java b/ide/mercurial/src/org/netbeans/modules/mercurial/HgProgressSupport.java index c59dba611774..2d9bf6cf788d 100644 --- a/ide/mercurial/src/org/netbeans/modules/mercurial/HgProgressSupport.java +++ b/ide/mercurial/src/org/netbeans/modules/mercurial/HgProgressSupport.java @@ -21,12 +21,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.beans.PropertyChangeListener; import java.io.File; -import java.text.DateFormat; -import java.util.Date; import java.util.logging.Level; -import javax.swing.Action; import javax.swing.JComponent; import javax.swing.JButton; import org.netbeans.api.progress.ProgressHandle; @@ -183,7 +179,7 @@ protected String getDisplayName() { protected ProgressHandle getProgressHandle() { if(progressHandle==null) { - progressHandle = ProgressHandleFactory.createHandle(displayName, this, getLogger().getOpenOutputAction()); + progressHandle = ProgressHandle.createHandle(displayName, this, getLogger().getOpenOutputAction()); } return progressHandle; } diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.form b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.form index d9b9dda023a2..2051ce630411 100644 --- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.form +++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/status/VersioningPanel.form @@ -1,4 +1,4 @@ - + - - org.netbeans.api.progress.nb - diff --git a/ide/parsing.indexing/nbproject/project.xml b/ide/parsing.indexing/nbproject/project.xml index 0ca3ed16ef33..0093b40a5a3c 100644 --- a/ide/parsing.indexing/nbproject/project.xml +++ b/ide/parsing.indexing/nbproject/project.xml @@ -218,9 +218,6 @@ - - org.netbeans.api.progress.nb - org.netbeans.modules.projectapi.nb diff --git a/ide/parsing.nb/nbproject/project.xml b/ide/parsing.nb/nbproject/project.xml index 4a3cfb9a45e9..5f4e0f2a8b1e 100644 --- a/ide/parsing.nb/nbproject/project.xml +++ b/ide/parsing.nb/nbproject/project.xml @@ -243,9 +243,6 @@ - - org.netbeans.api.progress.nb - diff --git a/ide/project.ant.ui/nbproject/project.xml b/ide/project.ant.ui/nbproject/project.xml index 608baf8e4f31..73f0022ef3a1 100644 --- a/ide/project.ant.ui/nbproject/project.xml +++ b/ide/project.ant.ui/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.project.ant diff --git a/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/CustomizerDialog.java b/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/CustomizerDialog.java index 6c49676d6925..b791450f69ac 100644 --- a/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/CustomizerDialog.java +++ b/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/CustomizerDialog.java @@ -256,7 +256,7 @@ public Object run() { } }); - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(CustomizerDialog.class, "LBL_Saving_Project_data_progress")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(CustomizerDialog.class, "LBL_Saving_Project_data_progress")); JComponent component = ProgressHandleFactory.createProgressComponent(handle); Frame mainWindow = WindowManager.getDefault().getMainWindow(); final JDialog dialog = new JDialog(mainWindow, diff --git a/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java b/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java index 0ca074e60cfa..2946a0ef479d 100644 --- a/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java +++ b/ide/projectuiapi/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementation.java @@ -19,10 +19,8 @@ package org.netbeans.modules.project.uiapi; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dialog; -import java.awt.GridBagConstraints; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -40,8 +38,6 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; @@ -50,7 +46,6 @@ import org.netbeans.api.annotations.common.CheckForNull; import org.netbeans.api.annotations.common.NullAllowed; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; @@ -171,7 +166,7 @@ static void deleteProject(final Project project, UserInputHandler handler) { } } - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Delete_Project_Caption")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Delete_Project_Caption")); final DefaultProjectDeletePanel deletePanel = new DefaultProjectDeletePanel(handle, displayName, FileUtil.getFileDisplayName(projectFolder), !dataFiles.isEmpty()); String caption = NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Delete_Project_Caption"); @@ -228,7 +223,7 @@ private static final class GUIUserInputHandler implements UserInputHandler { // public static void copyProject(final Project project) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Copy_Project_Handle")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Copy_Project_Handle")); final ProjectCopyPanel panel = new ProjectCopyPanel(handle, project, false); //#76559 handle.start(MAX_WORK); @@ -325,7 +320,7 @@ public static void copyProject(final Project project) { // public static void moveProject(final Project project) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Move_Project_Handle")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Move_Project_Handle")); final ProjectCopyPanel panel = new ProjectCopyPanel(handle, project, true); //#76559 handle.start(MAX_WORK); @@ -361,7 +356,7 @@ public static void renameProject(Project project) { } public static void renameProject(final Project project, final String nueName) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Rename_Project_Handle")); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultProjectOperationsImplementation.class, "LBL_Rename_Project_Handle")); final DefaultProjectRenamePanel panel = new DefaultProjectRenamePanel(handle, project, nueName); //#76559 diff --git a/ide/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementationTest.java b/ide/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementationTest.java index 6d795d5d42ab..2e3686ca5bad 100644 --- a/ide/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementationTest.java +++ b/ide/projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/DefaultProjectOperationsImplementationTest.java @@ -25,7 +25,6 @@ import java.util.List; import javax.swing.JComponent; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.TestUtil; @@ -214,7 +213,7 @@ public void showConfirmationDialog(final JComponent panel, Project project, Stri // public void testCopyWithLib() throws Exception { TestUtil.createFileFromContent(DefaultProjectOperationsImplementationTest.class.getResource("data/test.txt"), projdir, "lib/test.txt"); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject newTarget = prj.getProjectDirectory().getParent(); @@ -234,7 +233,7 @@ public void testCopyWithInnerProjectSimple() throws Exception { createProject(projdir2); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject newTarget = prj.getProjectDirectory().getParent(); @@ -255,7 +254,7 @@ public void testCopyWithInnerProjectComplex() throws Exception { createProject(projdir2); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject newTarget = prj.getProjectDirectory().getParent(); @@ -279,7 +278,7 @@ public void testMainProjectFlagNotMovedWhenCopying() throws Exception { OpenProjects.getDefault().setMainProject(prj); assertTrue(prj.getProjectDirectory().equals(OpenProjects.getDefault().getMainProject().getProjectDirectory())); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); File oldProjectFile = FileUtil.toFile(oldProject); @@ -296,7 +295,7 @@ public void testMainProjectFlagNotMovedWhenCopying() throws Exception { // public void testMoveWithLib() throws Exception { TestUtil.createFileFromContent(DefaultProjectOperationsImplementationTest.class.getResource("data/test.txt"), projdir, "lib/test.txt"); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); File oldProjectFile = FileUtil.toFile(oldProject); @@ -320,7 +319,7 @@ public void testMoveWithInnerProjectSimple() throws Exception { createProject(projdir2); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); File oldProjectFile = FileUtil.toFile(oldProject); @@ -345,7 +344,7 @@ public void testMoveWithInnerProjectComplex() throws Exception { createProject(projdir2); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); @@ -368,7 +367,7 @@ public void testMainProjectFlagMovedForMainProject() throws Exception { OpenProjects.getDefault().open(new Project[] {prj}, false); OpenProjects.getDefault().setMainProject(prj); assertEquals(prj, OpenProjects.getDefault().getMainProject()); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); File oldProjectFile = FileUtil.toFile(oldProject); @@ -388,7 +387,7 @@ public void testMainProjectFlagNotMovedForNonMainProject() throws Exception { assertTrue(main == null || !prj.getProjectDirectory().equals(main.getProjectDirectory())); - ProgressHandle handle = ProgressHandleFactory.createHandle("test-handle"); + ProgressHandle handle = ProgressHandle.createHandle("test-handle"); handle.start(DefaultProjectOperationsImplementation.MAX_WORK); FileObject oldProject = prj.getProjectDirectory(); File oldProjectFile = FileUtil.toFile(oldProject); diff --git a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java index c29f4f006cac..fe7412c92a38 100644 --- a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java +++ b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/ParametersPanel.java @@ -857,7 +857,7 @@ public void run() { stop(event); } progressPanel.remove(innerPanel); - progressBar = ProgressBar.create(progressHandle = ProgressHandleFactory.createHandle("")); //NOI18N + progressBar = ProgressBar.create(progressHandle = ProgressHandle.createHandle("")); //NOI18N if (event.getCount() == -1) { isIndeterminate = true; progressHandle.start(); diff --git a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java index 5284b16a63f4..f69f02fb5c44 100644 --- a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java +++ b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java @@ -723,7 +723,7 @@ private void refresh(final boolean showParametersPanel) { } this.left.remove(customComponent); } - final ProgressHandle progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RefactoringPanel.class, isQuery ? "LBL_PreparingUsagesTree":"LBL_PreparingRefactoringTree")); + final ProgressHandle progressHandle = ProgressHandle.createHandle(NbBundle.getMessage(RefactoringPanel.class, isQuery ? "LBL_PreparingUsagesTree":"LBL_PreparingRefactoringTree")); if (currentView == GRAPHICAL) { assert refactoringUI instanceof RefactoringCustomUI; assert customComponent != null; @@ -1303,7 +1303,7 @@ private static class ProgressL implements ProgressListener { public ProgressL() { final String lab = NbBundle.getMessage(RefactoringPanel.class, "LBL_RefactorProgressLabel"); - handle = ProgressHandleFactory.createHandle(lab); + handle = ProgressHandle.createHandle(lab); JComponent progress = ProgressHandleFactory.createProgressComponent(handle); JPanel component = new JPanel(); component.setLayout(new BorderLayout()); @@ -1356,7 +1356,7 @@ private class FUListener implements ProgressListener, Cancellable { @Override public void start(final ProgressEvent event) { - handle = ProgressHandleFactory.createHandle(getMessage(event), this); + handle = ProgressHandle.createHandle(getMessage(event), this); if (event.getCount() == -1) { handle.start(); handle.switchToIndeterminate(); diff --git a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnProgressSupport.java b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnProgressSupport.java index d92f3a7fcee0..e8efbf6dbb15 100644 --- a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnProgressSupport.java +++ b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnProgressSupport.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.logging.Level; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.subversion.OutputLogger; import org.netbeans.modules.subversion.Subversion; import org.netbeans.modules.subversion.util.SvnUtils; @@ -147,9 +146,9 @@ protected String getDisplayName() { protected ProgressHandle getProgressHandle() { if(progressHandle == null) { if(repositoryRoot != null) { - progressHandle = ProgressHandleFactory.createHandle(displayName, this, getLogger().getOpenOutputAction()); + progressHandle = ProgressHandle.createHandle(displayName, this, getLogger().getOpenOutputAction()); } else { - progressHandle = ProgressHandleFactory.createHandle(displayName, this); + progressHandle = ProgressHandle.createHandle(displayName, this); } } return progressHandle; diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/status/VersioningPanel.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/status/VersioningPanel.java index 441ea7db595b..ddd603f99395 100644 --- a/ide/subversion/src/org/netbeans/modules/subversion/ui/status/VersioningPanel.java +++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/status/VersioningPanel.java @@ -30,7 +30,6 @@ import org.netbeans.modules.subversion.util.Context; import org.netbeans.modules.subversion.util.SvnUtils; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.explorer.ExplorerManager; import org.openide.nodes.*; import org.openide.windows.TopComponent; @@ -260,7 +259,7 @@ public void run() { @Override public void run () { // XXX attach Cancelable hook - final ProgressHandle ph = ProgressHandleFactory.createHandle(NbBundle.getMessage(VersioningPanel.class, "MSG_Refreshing_Versioning_View")); // NOI18N + final ProgressHandle ph = ProgressHandle.createHandle(NbBundle.getMessage(VersioningPanel.class, "MSG_Refreshing_Versioning_View")); // NOI18N try { Thread.interrupted(); // clear interupted status ph.start(); diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.form b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.form index 7a1335cb23a4..70c3b2dcc084 100644 --- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.form +++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.form @@ -38,7 +38,6 @@ - diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java index 81c8b309047c..f223948fb986 100644 --- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java +++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java @@ -42,7 +42,6 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.tasklist.filter.FilterRepository; import org.netbeans.modules.tasklist.impl.ScannerList; import org.netbeans.modules.tasklist.impl.ScanningScopeList; @@ -508,7 +507,7 @@ public void propertyChange( PropertyChangeEvent e ) { synchronized( TaskListTopComponent.this ) { if( ((Boolean)e.getNewValue()).booleanValue() ) { if( null == progress ) { - progress = ProgressHandleFactory.createHandle( + progress = ProgressHandle.createHandle( NbBundle.getMessage( TaskListTopComponent.class, "LBL_ScanProgress" ), //NOI18N new Cancellable() { //NOI18N @Override diff --git a/ide/team.commons/nbproject/project.xml b/ide/team.commons/nbproject/project.xml index f2427adc6bbc..5869bfb7dde8 100644 --- a/ide/team.commons/nbproject/project.xml +++ b/ide/team.commons/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.keyring diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java index ecc6dc765e74..23d1c40ac553 100644 --- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java +++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java @@ -53,7 +53,6 @@ import javax.swing.GroupLayout; import javax.swing.GroupLayout.ParallelGroup; import javax.swing.GroupLayout.SequentialGroup; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; @@ -64,7 +63,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.team.ide.spi.IDEServices; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -720,7 +718,7 @@ public void open() { // XXX String progressFormat = NbBundle.getMessage(OpenAttachmentAction.class, "Attachment.open.progress"); //NOI18N String progressMessage = MessageFormat.format(progressFormat, getFilename()); - final ProgressHandle handle = ProgressHandleFactory.createHandle(progressMessage); + final ProgressHandle handle = ProgressHandle.createHandle(progressMessage); handle.start(); handle.switchToIndeterminate(); Support.getInstance().getParallelRP().post(new Runnable() { @@ -758,7 +756,7 @@ public void run() { public void openInStackAnalyzer() { String progressFormat = NbBundle.getMessage(OpenAttachmentAction.class, "Attachment.open.progress"); //NOI18N String progressMessage = MessageFormat.format(progressFormat, getFilename()); - final ProgressHandle handle = ProgressHandleFactory.createHandle(progressMessage); + final ProgressHandle handle = ProgressHandle.createHandle(progressMessage); handle.start(); handle.switchToIndeterminate(); Support.getInstance().getParallelRP().post(new Runnable() { @@ -863,7 +861,7 @@ private void saveToFile() { SaveAttachmentAction.class, "Attachment.saveToFile.progress"); //NOI18N String progressMessage = MessageFormat.format(progressFormat, getFilename()); - final ProgressHandle handle = ProgressHandleFactory.createHandle(progressMessage); + final ProgressHandle handle = ProgressHandle.createHandle(progressMessage); handle.start(); handle.switchToIndeterminate(); Support.getInstance().getParallelRP().post(new Runnable() { @@ -884,7 +882,7 @@ public void run() { private void applyPatch() { String progressFormat = NbBundle.getMessage(AttachmentsPanel.class,"Attachment.applyPatch.progress"); //NOI18N String progressMessage = MessageFormat.format(progressFormat, getFilename()); - final ProgressHandle handle = ProgressHandleFactory.createHandle(progressMessage); + final ProgressHandle handle = ProgressHandle.createHandle(progressMessage); handle.start(); handle.switchToIndeterminate(); Support.getInstance().getParallelRP().post( diff --git a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java index f46c68f4b6cc..e1a5ba62c6ed 100644 --- a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java +++ b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java @@ -690,7 +690,7 @@ public void actionPerformed(ActionEvent e) { return; } synchronized(TIMER_LOCK) { - handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(HistoryDiffView.class, "LBL_PreparingDiff")); // NOI18N + handle = ProgressHandle.createHandle(NbBundle.getMessage(HistoryDiffView.class, "LBL_PreparingDiff")); // NOI18N setProgressComponent(ProgressHandleFactory.createProgressComponent(handle)); handle.start(); handle.switchToIndeterminate(); diff --git a/ide/versioning.util/nbproject/project.xml b/ide/versioning.util/nbproject/project.xml index 4ad4c3e9d9c8..43f2f2688095 100644 --- a/ide/versioning.util/nbproject/project.xml +++ b/ide/versioning.util/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.diff diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/diff/FilesModifiedConfirmation.java b/ide/versioning.util/src/org/netbeans/modules/versioning/diff/FilesModifiedConfirmation.java index 5afd64d31cc5..3bee3ffaaee7 100644 --- a/ide/versioning.util/src/org/netbeans/modules/versioning/diff/FilesModifiedConfirmation.java +++ b/ide/versioning.util/src/org/netbeans/modules/versioning/diff/FilesModifiedConfirmation.java @@ -41,7 +41,7 @@ import javax.swing.UIManager; 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.versioning.util.CollectionUtils; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -51,6 +51,7 @@ import org.openide.util.Exceptions; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; + import static org.openide.NotifyDescriptor.CANCEL_OPTION; import static org.openide.NotifyDescriptor.DEFAULT_OPTION; import static org.openide.NotifyDescriptor.ERROR_MESSAGE; @@ -292,7 +293,7 @@ private String save(int index, boolean removeSavedFromList) { final SaveCookie saveCookie = listModel.getElementAt(index); final AtomicReference errMsg = new AtomicReference(); - ProgressUtils.showProgressDialogAndRun(new Runnable() { + BaseProgressUtils.showProgressDialogAndRun(new Runnable() { @Override public void run () { try { diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java index ff21fcd4f66f..40094a78c37f 100644 --- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java +++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java @@ -35,7 +35,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -176,7 +175,7 @@ public boolean cancel() { return true; } }; - final ProgressHandle handle = ProgressHandleFactory.createHandle(getMessage("CTL_Attaching"), c); + final ProgressHandle handle = ProgressHandle.createHandle(getMessage("CTL_Attaching"), c); handle.start(); t[0] = Utils.createTask(new Runnable() { public void run() { diff --git a/ide/xml.retriever/nbproject/project.xml b/ide/xml.retriever/nbproject/project.xml index c601e5df568b..719d5e750382 100644 --- a/ide/xml.retriever/nbproject/project.xml +++ b/ide/xml.retriever/nbproject/project.xml @@ -42,14 +42,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.xml diff --git a/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/impl/RetrieverEngineImpl.java b/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/impl/RetrieverEngineImpl.java index 1293d6171b8c..542384b96730 100644 --- a/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/impl/RetrieverEngineImpl.java +++ b/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/impl/RetrieverEngineImpl.java @@ -37,7 +37,6 @@ import java.util.StringTokenizer; import javax.swing.AbstractAction; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.modules.xml.retriever.DocumentParserFactory; @@ -108,7 +107,7 @@ public void start(){ boolean STOP_PULL = false; public void run() { - ProgressHandle ph = ProgressHandleFactory.createHandle( + ProgressHandle ph = ProgressHandle.createHandle( NbBundle.getMessage(RetrieverEngineImpl.class,"LBL_PROGRESSBAR_Retrieve_XML"), new Cancellable(){ public boolean cancel() { diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java index 4d1070f2b175..7169fa8388a5 100644 --- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java +++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java @@ -307,7 +307,7 @@ public boolean isRunnable() { private void invokeHandlers(final List handlers, final Parameters params) { final ProgressPanel progressPanel = new ProgressPanel(); - ProgressHandle progressHandle = ProgressHandleFactory.createHandle(null); + ProgressHandle progressHandle = ProgressHandle.createHandle(null); JComponent progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressHandle.start(); diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/ProgressFrame.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/ProgressFrame.java index cef488a91062..9de2c9771525 100644 --- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/ProgressFrame.java +++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/ProgressFrame.java @@ -47,7 +47,7 @@ public ProgressFrame() { this.getAccessibleContext().setAccessibleDescription(bundle.getString("ACS_ProgressFrameTabA11yDesc")); // NOI18N okButton.getAccessibleContext().setAccessibleDescription(bundle.getString("ACS_CancelButtonA11yDesc")); // NOI18N - progressHandle = ProgressHandleFactory.createHandle(null); + progressHandle = ProgressHandle.createHandle(null); progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressPanel.add(progressComponent); progressHandle.start(); diff --git a/java/debugger.jpda.visual/nbproject/project.xml b/java/debugger.jpda.visual/nbproject/project.xml index 8c5bea1eeca8..904640b3a6ee 100644 --- a/java/debugger.jpda.visual/nbproject/project.xml +++ b/java/debugger.jpda.visual/nbproject/project.xml @@ -68,14 +68,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.debugger.jpda diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/actions/TakeScreenshotActionProvider.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/actions/TakeScreenshotActionProvider.java index 79163d8776c7..316b5a4fdc7f 100644 --- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/actions/TakeScreenshotActionProvider.java +++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/actions/TakeScreenshotActionProvider.java @@ -32,7 +32,6 @@ import org.netbeans.api.debugger.Watch; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.modules.debugger.jpda.visual.JavaComponentInfo; import org.netbeans.modules.debugger.jpda.visual.RemoteAWTScreenshot; import org.netbeans.modules.debugger.jpda.visual.RemoteFXScreenshot; @@ -137,7 +136,7 @@ public void run() { } private ProgressHandle createProgress() { - ProgressHandle ph = ProgressHandleFactory.createHandle(NbBundle.getMessage(TakeScreenshotActionProvider.class, "MSG_TakingApplicationScreenshot")); + ProgressHandle ph = ProgressHandle.createHandle(NbBundle.getMessage(TakeScreenshotActionProvider.class, "MSG_TakingApplicationScreenshot")); ph.setInitialDelay(500); ph.start(); return ph; diff --git a/java/form.nb/src/org/netbeans/modules/nbform/SwingAppLibDownloader.java b/java/form.nb/src/org/netbeans/modules/nbform/SwingAppLibDownloader.java index 08b38993a889..6eb02823eedb 100644 --- a/java/form.nb/src/org/netbeans/modules/nbform/SwingAppLibDownloader.java +++ b/java/form.nb/src/org/netbeans/modules/nbform/SwingAppLibDownloader.java @@ -92,7 +92,7 @@ private Library download(String name) throws Exception { UpdateUnit unit = findSwingAppLibModule(); if (unit == null) { String searchingHandleTxt = FormUtils.getBundleString("swingapp.searching_handle"); // NOI18N - final ProgressHandle handle = ProgressHandleFactory.createHandle(searchingHandleTxt); + final ProgressHandle handle = ProgressHandle.createHandle(searchingHandleTxt); initButtons(); final DialogDescriptor searching = new DialogDescriptor( searchingPanel(new JLabel(searchingHandleTxt), ProgressHandleFactory.createProgressComponent(handle)), @@ -176,7 +176,7 @@ public void run() { for (UpdateElement req : oc.add(unit.getInstalled()).getRequiredElements()) { oc.add(req); } - ProgressHandle activeHandle = ProgressHandleFactory.createHandle (FormUtils.getBundleString("swingapp.active_handle")); // NOI18N + ProgressHandle activeHandle = ProgressHandle.createHandle (FormUtils.getBundleString("swingapp.active_handle")); // NOI18N Restarter restarter = oc.getSupport().doOperation(activeHandle); assert restarter == null : "No Restater need to make " + unit.getInstalled() + " active"; // NOI18N // XXX new library & build.properties apparently do not show up immediately... how to listen properly? diff --git a/java/form/src/org/netbeans/modules/form/BindingCustomizer.java b/java/form/src/org/netbeans/modules/form/BindingCustomizer.java index ae5215079fa9..178dd695044b 100644 --- a/java/form/src/org/netbeans/modules/form/BindingCustomizer.java +++ b/java/form/src/org/netbeans/modules/form/BindingCustomizer.java @@ -1047,7 +1047,7 @@ private void importDataButtonActionPerformed(java.awt.event.ActionEvent evt) {// if (importer != null) { final Future task = importer.importData(bindingComponent.getFormModel()); if (task != null) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(null, (Cancellable)null); + final ProgressHandle handle = ProgressHandle.createHandle(null, (Cancellable)null); JComponent handlePanel = panelForHandle(handle); handle.start(); handle.progress(FormUtils.getBundleString("MSG_BindingCustomizer_Importing")); // NOI18N diff --git a/java/form/src/org/netbeans/modules/form/project/ClassPathUtils.java b/java/form/src/org/netbeans/modules/form/project/ClassPathUtils.java index 74699ebe7d10..c24bed37394a 100644 --- a/java/form/src/org/netbeans/modules/form/project/ClassPathUtils.java +++ b/java/form/src/org/netbeans/modules/form/project/ClassPathUtils.java @@ -35,7 +35,7 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressRunnable; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.form.FormUtils; import org.netbeans.spi.java.classpath.support.ClassPathSupport; @@ -238,7 +238,7 @@ public void run() { }); } else { String msg = getBundleString("MSG_UpdatingClassPath"); // NOI18N - Object retVal = ProgressUtils.showProgressDialogAndRun(new ProgressRunnable() { + Object retVal = BaseProgressUtils.showProgressDialogAndRun(new ProgressRunnable() { @Override public Object run(ProgressHandle handle) { try { diff --git a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java index fa59cf9cd9b3..18492584d9c1 100644 --- a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java +++ b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java @@ -116,7 +116,7 @@ public boolean invoke() { progressPanel.setCancelVisible(cancellable); progressPanel.addCancelActionListener(this); - ProgressHandle progressHandle = ProgressHandleFactory.createHandle(null); + ProgressHandle progressHandle = ProgressHandle.createHandle(null); JComponent progressComponent = ProgressHandleFactory.createProgressComponent(progressHandle); progressHandle.start(); progressHandle.switchToIndeterminate(); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/hyperlink/NamedQueryHyperlinkProvider.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/hyperlink/NamedQueryHyperlinkProvider.java index c7611efff4d7..02358471aabe 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/hyperlink/NamedQueryHyperlinkProvider.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/hyperlink/NamedQueryHyperlinkProvider.java @@ -42,7 +42,7 @@ import org.netbeans.api.lexer.TokenHierarchy; import org.netbeans.api.lexer.TokenSequence; import org.netbeans.api.lexer.TokenUtilities; -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.lib.editor.hyperlink.spi.HyperlinkProviderExt; @@ -83,7 +83,7 @@ public int[] getHyperlinkSpan(Document doc, int offset, HyperlinkType type) { @Override public void performClickAction(final Document doc, final int offset, HyperlinkType type) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread( + BaseProgressUtils.runOffEventDispatchThread( () -> goToNQ(doc, offset), NbBundle.getMessage(NamedQueryHyperlinkProvider.class, "LBL_GoToNamedQuery"), cancel, diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java index 05c126eae782..7b9336b0818a 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java @@ -57,7 +57,6 @@ import org.netbeans.api.db.explorer.ConnectionManager; import org.netbeans.api.db.explorer.DatabaseConnection; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.FileOwnerQuery; import org.netbeans.api.project.Project; import org.netbeans.modules.editor.NbEditorDocument; @@ -318,7 +317,7 @@ public void run() { if (Thread.interrupted() || isSqlTranslationProcessDone) { return; // Cancel the task } - ph2 = ProgressHandleFactory.createHandle( + ph2 = ProgressHandle.createHandle( NbBundle.getMessage(JPQLEditorTopComponent.class, "progressTaskname")); ph2.start(100); FileObject pXml = puObject.getPrimaryFile(); @@ -827,37 +826,37 @@ private int getMaxRowCount() { return 1000; // Optimum value. } -private void resultToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_resultToggleButtonItemStateChanged - if (resultToggleButton.isSelected()) {//GEN-LAST:event_resultToggleButtonItemStateChanged + private void resultToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_resultToggleButtonItemStateChanged + if (resultToggleButton.isSelected()) { ((CardLayout) (executionPanel.getLayout())).first(executionPanel); sqlToggleButton.setSelected(false); } - } + }//GEN-LAST:event_resultToggleButtonItemStateChanged -private void sqlToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_sqlToggleButtonItemStateChanged - if (sqlToggleButton.isSelected()) {//GEN-HEADEREND:event_sqlToggleButtonItemStateChanged - ((CardLayout) (executionPanel.getLayout())).last(executionPanel);//GEN-LAST:event_sqlToggleButtonItemStateChanged + private void sqlToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_sqlToggleButtonItemStateChanged + if (sqlToggleButton.isSelected()) { + ((CardLayout) (executionPanel.getLayout())).last(executionPanel); resultToggleButton.setSelected(false); } - } + }//GEN-LAST:event_sqlToggleButtonItemStateChanged -private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_runJPQLButtonActionPerformed - // Fix - 138856 - if(jpqlEditor.getText().trim().equals("")) { - switchToResultView(); - setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyQuery")); - return; - } - if (puComboBox.getSelectedItem() == null) { - logger.info("hibernate configuration combo box is empty."); - switchToResultView(); - setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyConfiguration")); - return; - } - runJPQLButton.setEnabled(false); - try { - ph = ProgressHandleFactory.createHandle(//GEN-HEADEREND:event_runJPQLButtonActionPerformed - NbBundle.getMessage(JPQLEditorTopComponent.class, "progressTaskname"));//GEN-LAST:event_runJPQLButtonActionPerformed + private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_runJPQLButtonActionPerformed + // Fix - 138856 + if(jpqlEditor.getText().trim().equals("")) { + switchToResultView(); + setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyQuery")); + return; + } + if (puComboBox.getSelectedItem() == null) { + logger.info("hibernate configuration combo box is empty."); + switchToResultView(); + setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyConfiguration")); + return; + } + runJPQLButton.setEnabled(false); + try { + ph = ProgressHandle.createHandle( + NbBundle.getMessage(JPQLEditorTopComponent.class, "progressTaskname")); isSqlTranslationProcessDone = true;//will be reparsed in execution thread if (hqlParserTask != null && !hqlParserTask.isFinished() && (hqlParserTask.getDelay() != 0)) { hqlParserTask.cancel(); @@ -877,7 +876,8 @@ private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN } catch (Exception ex) { Exceptions.printStackTrace(ex); } - } + }//GEN-LAST:event_runJPQLButtonActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel containerPanel; private javax.swing.JTextArea errorTextArea; diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java index be2657517fa1..aa6632db2624 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java @@ -45,7 +45,7 @@ import org.netbeans.api.java.classpath.JavaClassPathConstants; import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.project.classpath.ProjectClassPathModifier; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; @@ -729,7 +729,7 @@ public static void addLibraryToProject(Project project, Library library) { public static void addLibraryToProject(Project project, Library library, String classpathType) { if(SwingUtilities.isEventDispatchThread()){ AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread( new AddLibrary(project, library, classpathType), + BaseProgressUtils.runOffEventDispatchThread( new AddLibrary(project, library, classpathType), NbBundle.getMessage(Util.class, "TTL_ExtendProjectClasspath"), cancel, false ); // NOI18N } else { diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/RelatedCMPWizard.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/RelatedCMPWizard.java index d4eb1aa58991..ee34a9a8e316 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/RelatedCMPWizard.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/RelatedCMPWizard.java @@ -32,6 +32,7 @@ import org.netbeans.api.java.classpath.JavaClassPathConstants; import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.core.api.support.SourceGroups; @@ -242,9 +243,9 @@ public Set instantiate(final TemplateWizard wiz) throws IOException } final String title = NbBundle.getMessage(RelatedCMPWizard.class, "TXT_EntityClassesGeneration"); - final ProgressContributor progressContributor = AggregateProgressFactory.createProgressContributor(title); + final ProgressContributor progressContributor = BasicAggregateProgressFactory.createProgressContributor(title); final AggregateProgressHandle handle = - AggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); + BasicAggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); progressPanel = new ProgressPanel(); final JComponent progressComponent = AggregateProgressFactory.createProgressComponent(handle); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java index 7b93c0345324..39bee595ed02 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java @@ -30,6 +30,7 @@ import javax.swing.event.ChangeListener; import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.api.project.Project; import org.netbeans.modules.j2ee.core.api.support.java.GenerationUtils; @@ -87,9 +88,9 @@ public Set instantiate(TemplateWizard wizard) throws IOException { } final String title = NbBundle.getMessage(JpaControllerIterator.class, "TITLE_Progress_Jpa_Controller"); //NOI18N - final ProgressContributor progressContributor = AggregateProgressFactory.createProgressContributor(title); + final ProgressContributor progressContributor = BasicAggregateProgressFactory.createProgressContributor(title); final AggregateProgressHandle handle = - AggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); + BasicAggregateProgressFactory.createHandle(title, new ProgressContributor[]{progressContributor}, null, null); final ProgressPanel progressPanel = new ProgressPanel(); final JComponent progressComponent = AggregateProgressFactory. createProgressComponent(handle); diff --git a/java/java.api.common/nbproject/project.xml b/java/java.api.common/nbproject/project.xml index 46ddf51403fe..be65649bb230 100644 --- a/java/java.api.common/nbproject/project.xml +++ b/java/java.api.common/nbproject/project.xml @@ -79,14 +79,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/RemoveClassPathRootAction.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/RemoveClassPathRootAction.java index 4487ed68744f..33ab9805cf52 100644 --- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/RemoveClassPathRootAction.java +++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/RemoveClassPathRootAction.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.ProjectManager; import org.openide.util.Exceptions; @@ -129,7 +129,7 @@ protected void performAction(final Node[] activatedNodes) { removables.forEach(Removable::afterRemove); } }; - ProgressUtils.runOffEventDispatchThread( + BaseProgressUtils.runOffEventDispatchThread( action, NbBundle.getMessage(RemoveClassPathRootAction.class, "TXT_RemovingClassPathRoots"), cancel, diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/wizards/FolderList.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/wizards/FolderList.java index 1c364e38d888..93be4a23f38b 100644 --- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/wizards/FolderList.java +++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/wizards/FolderList.java @@ -52,7 +52,7 @@ import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressRunnable; -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.SourceGroup; @@ -305,7 +305,7 @@ public boolean cancel() { } }; final ScanTask task = new ScanTask(); - ProgressUtils.showProgressDialogAndRun(task, NbBundle.getMessage(FolderList.class, "TXT_SearchingSourceRoots"), false); + BaseProgressUtils.showProgressDialogAndRun(task, NbBundle.getMessage(FolderList.class, "TXT_SearchingSourceRoots"), false); final List toAdd = toAddRef.get(); final List related = new LinkedList(); if (relatedFolderList != null && relatedFolderFilter != null && toAdd != null) { diff --git a/java/java.editor/nbproject/project.xml b/java/java.editor/nbproject/project.xml index 7c09e3513d2a..75d19165d801 100644 --- a/java/java.editor/nbproject/project.xml +++ b/java/java.editor/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.javacapi diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/ComputeOffAWT.java b/java/java.editor/src/org/netbeans/modules/editor/java/ComputeOffAWT.java index 589775910a10..7ecb73647187 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/ComputeOffAWT.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/ComputeOffAWT.java @@ -26,7 +26,7 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.Task; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.openide.util.Exceptions; /** @@ -39,7 +39,7 @@ public static T computeOffAWT(Worker w, String featureName, final JavaSou AtomicBoolean cancel = new AtomicBoolean(); Compute c = new Compute(cancel, source, phase, w); - ProgressUtils.runOffEventDispatchThread(c, featureName, cancel, false); + BaseProgressUtils.runOffEventDispatchThread(c, featureName, cancel, false); return c.result; } diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/GoToSupport.java b/java/java.editor/src/org/netbeans/modules/editor/java/GoToSupport.java index 3e8b08e4e7a2..31baf4708af2 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/GoToSupport.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/GoToSupport.java @@ -99,7 +99,7 @@ import org.netbeans.api.lexer.TokenHierarchy; import org.netbeans.api.lexer.TokenSequence; import org.netbeans.api.lsp.HyperlinkLocation; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.ext.ToolTipSupport; import org.netbeans.lib.editor.hyperlink.spi.HyperlinkType; import org.netbeans.lib.editor.util.StringEscapeUtils; @@ -218,7 +218,7 @@ private static boolean isError(Element el) { private static void performGoTo(final Document doc, final int offset, final boolean goToSource, final boolean javadoc) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { performGoToImpl(doc, offset, goToSource, javadoc, cancel); diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessor.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessor.java index cbd7f39eff62..2d3b899bea56 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessor.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessor.java @@ -36,7 +36,7 @@ import org.netbeans.api.java.source.*; import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner; import org.netbeans.api.java.source.ui.ElementHeaders; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.lib.editor.codetemplates.spi.*; import org.netbeans.modules.editor.NbEditorUtilities; import org.netbeans.modules.java.preprocessorbridge.api.JavaSourceUtil; @@ -1103,7 +1103,7 @@ private void initParsing(final boolean localsNeeded) { final FileObject fo = NbEditorUtilities.getFileObject(doc); if (fo != null) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java index 7a453406df24..859e9c3b92cc 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java @@ -61,7 +61,7 @@ import org.netbeans.api.lexer.TokenHierarchy; import org.netbeans.api.lexer.TokenSequence; import org.netbeans.api.options.OptionsDisplayer; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.whitelist.WhiteListQuery; import org.netbeans.editor.BaseDocument; import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager; @@ -1073,7 +1073,7 @@ protected String getInsertPostfix(JTextComponent c) { protected CharSequence substituteText(final JTextComponent c, final int offset, final int length, final CharSequence text, final CharSequence toAdd) { final StringBuilder template = new StringBuilder(); final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -1727,7 +1727,7 @@ public void run() { final String[] prefix = {""}; //NOI18N if (findPrefix.get()) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -1758,7 +1758,7 @@ public void run(ResultIterator resultIterator) throws Exception { CharSequence cs = super.substituteText(c, offset, length, prefix[0] + text, toAdd); if (autoImportEnclosingType) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -2104,7 +2104,7 @@ protected CharSequence substituteText(final JTextComponent c, final int offset, } if (autoImportEnclosingType) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -3043,7 +3043,7 @@ protected CharSequence substituteText(final JTextComponent c, final int offset, final BaseDocument doc = (BaseDocument)c.getDocument(); final StringBuilder sb = new StringBuilder(); final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -3539,7 +3539,7 @@ protected CharSequence substituteText(final JTextComponent c, final int offset, final StringBuilder template = new StringBuilder(); final AtomicBoolean cancel = new AtomicBoolean(); final CharSequence finalToAdd = toAdd; - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { @@ -4530,7 +4530,7 @@ private static int findPositionForSemicolon(JTextComponent c) { final int offset = c.getSelectionEnd(); final Source s = Source.create(c.getDocument()); final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaMoveCodeElementAction.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaMoveCodeElementAction.java index 473034a46d8c..e5f754bda098 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaMoveCodeElementAction.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaMoveCodeElementAction.java @@ -43,7 +43,7 @@ import org.netbeans.api.java.source.Task; import org.netbeans.api.java.source.TreeUtilities; import org.netbeans.api.lexer.TokenSequence; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.BaseDocument; import org.netbeans.editor.GuardedDocument; @@ -74,7 +74,7 @@ public void actionPerformed(final ActionEvent evt, final JTextComponent target) final JavaSource js = JavaSource.forDocument(doc); if (js != null) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/SelectCodeElementAction.java b/java/java.editor/src/org/netbeans/modules/editor/java/SelectCodeElementAction.java index f0d5bb16fe63..89c2120ba7ac 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/SelectCodeElementAction.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/SelectCodeElementAction.java @@ -46,7 +46,7 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.TreeUtilities; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.BaseDocument; import org.openide.text.NbDocument; @@ -143,7 +143,7 @@ public void selectNext() { final JavaSource js = JavaSource.forDocument(target.getDocument()); if (js != null) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGenerator.java b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGenerator.java index 6b957630528e..3184312fe920 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGenerator.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGenerator.java @@ -71,7 +71,7 @@ import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.TreeUtilities; import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.Utilities; import org.netbeans.modules.java.editor.codegen.ui.DelegatePanel; import org.netbeans.modules.java.editor.codegen.ui.ElementNode; @@ -197,7 +197,7 @@ public static ElementNode.Description getAvailableMethods(final JTextComponent c final int caretOffset = component.getCaretPosition(); final ElementNode.Description[] description = new ElementNode.Description[1]; final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/GetterSetterGenerator.java b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/GetterSetterGenerator.java index 1f2f68d4d462..7b725173dbd1 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/GetterSetterGenerator.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/GetterSetterGenerator.java @@ -40,7 +40,7 @@ import com.sun.source.util.TreePath; import org.netbeans.api.java.source.*; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseDocument; import org.netbeans.modules.java.editor.codegen.ui.ElementNode; import org.netbeans.modules.java.editor.codegen.ui.GetterSetterPanel; @@ -262,7 +262,7 @@ public void run(CompilationController parameter) throws Exception { } }, true); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/RemoveSurroundingCodeAction.java b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/RemoveSurroundingCodeAction.java index 598c8764ef21..cf4be295a74b 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/RemoveSurroundingCodeAction.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/RemoveSurroundingCodeAction.java @@ -71,7 +71,7 @@ import org.netbeans.api.java.source.WorkingCopy; 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.BaseAction; import org.netbeans.editor.BaseDocument; import org.netbeans.modules.editor.java.JavaKit; @@ -138,7 +138,7 @@ public void actionPerformed(final ActionEvent evt, final JTextComponent componen final JavaSource js = JavaSource.forDocument(doc); if (js != null) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/imports/FastImportAction.java b/java/java.editor/src/org/netbeans/modules/java/editor/imports/FastImportAction.java index 81957d561982..98046aab0560 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/imports/FastImportAction.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/imports/FastImportAction.java @@ -40,7 +40,7 @@ import org.netbeans.api.java.source.CompilationController; import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.Utilities; import org.netbeans.modules.java.editor.imports.ComputeImports.Pair; @@ -127,7 +127,7 @@ public void run() { } }; - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { try { diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/imports/ImportClassPanel.java b/java/java.editor/src/org/netbeans/modules/java/editor/imports/ImportClassPanel.java index ab54456343bf..4e5618a003da 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/imports/ImportClassPanel.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/imports/ImportClassPanel.java @@ -32,7 +32,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.ListIterator; import java.util.concurrent.atomic.AtomicBoolean; import javax.lang.model.element.Element; @@ -56,7 +55,7 @@ import org.netbeans.api.java.source.TreeUtilities; import org.netbeans.api.java.source.WorkingCopy; import org.netbeans.api.java.source.ui.ElementIcons; -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.modules.java.editor.codegen.GeneratorUtils; @@ -326,7 +325,7 @@ private boolean isImported(String fqn, List imports) { } }; - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { try { ModificationResult mr = javaSource.runModificationTask(task); diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/imports/JavaFixAllImports.java b/java/java.editor/src/org/netbeans/modules/java/editor/imports/JavaFixAllImports.java index 469407f91420..80f9064fddb2 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/imports/JavaFixAllImports.java +++ b/java/java.editor/src/org/netbeans/modules/java/editor/imports/JavaFixAllImports.java @@ -68,7 +68,7 @@ import org.netbeans.api.java.source.support.CancellableTreePathScanner; import org.netbeans.api.java.source.support.ReferencesCount; import org.netbeans.api.java.source.ui.ElementIcons; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.editor.java.Utilities; import org.netbeans.modules.java.editor.base.imports.UnusedImports; import org.netbeans.modules.java.editor.codegen.GeneratorUtils; @@ -144,7 +144,7 @@ public void run(final WorkingCopy wc) { if (javaSource == null) { StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage(JavaFixAllImports.class, "MSG_CannotFixImports")); } else { - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { try { diff --git a/java/java.hints/nbproject/project.xml b/java/java.hints/nbproject/project.xml index 5d467f2c2cc9..a9fe67477f43 100644 --- a/java/java.hints/nbproject/project.xml +++ b/java/java.hints/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/OrganizeImports.java b/java/java.hints/src/org/netbeans/modules/java/hints/OrganizeImports.java index 417aa8f2df54..32e50537374b 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/OrganizeImports.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/OrganizeImports.java @@ -67,7 +67,7 @@ import org.netbeans.api.java.source.ModificationResult.Difference; import org.netbeans.api.java.source.TreeMaker; import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.editor.BaseAction; import org.netbeans.editor.BaseDocument; import org.netbeans.modules.editor.java.JavaKit; @@ -409,7 +409,7 @@ public void actionPerformed(final ActionEvent evt, final JTextComponent componen final Source source = Source.create(doc); if (source != null) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { @Override public void run() { try { diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java index 26bbea714b99..937741df92ef 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/Analyzer.java @@ -25,12 +25,10 @@ import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Queue; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import java.util.prefs.Preferences; import javax.swing.SwingUtilities; import javax.swing.text.Document; import org.netbeans.api.java.source.ClasspathInfo; @@ -38,7 +36,6 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.Task; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; @@ -172,7 +169,7 @@ public boolean cancel() { } } - ProgressHandle h = ProgressHandleFactory.createHandle(NbBundle.getMessage(Analyzer.class, "LBL_AnalyzingJavadoc"), new Cancel()); // NOI18N + ProgressHandle h = ProgressHandle.createHandle(NbBundle.getMessage(Analyzer.class, "LBL_AnalyzingJavadoc"), new Cancel()); // NOI18N RP.post(new Analyzer(context, abCancel, h, hintsSettings)); } diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java index 892a90f1352a..3d2fa4aef87a 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java @@ -30,12 +30,11 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; -import java.util.prefs.Preferences; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressRunnable; -import org.netbeans.api.progress.ProgressUtils; import org.netbeans.modules.java.hints.analyzer.Analyzer; import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; import org.netbeans.spi.editor.hints.ErrorDescription; @@ -255,7 +254,7 @@ private void fixButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR applyingFixes = true; try { - ProgressUtils.showProgressDialogAndRun(new FixWorker(fixes), NbBundle.getMessage(AnalyzerTopComponent.class, "CAP_ApplyingFixes"), false); + BaseProgressUtils.showProgressDialogAndRun(new FixWorker(fixes), NbBundle.getMessage(AnalyzerTopComponent.class, "CAP_ApplyingFixes"), false); } finally { applyingFixes = false; stateChanged(null); diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/introduce/IntroduceAction.java b/java/java.hints/src/org/netbeans/modules/java/hints/introduce/IntroduceAction.java index 574189cc9647..a40abe7a4a06 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/introduce/IntroduceAction.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/introduce/IntroduceAction.java @@ -44,7 +44,7 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.lexer.TokenSequence; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.editor.MainMenuAction; import org.netbeans.modules.java.editor.overridden.PopupUtil; import org.netbeans.modules.java.hints.infrastructure.HintAction; @@ -115,7 +115,7 @@ private String doPerformAction(final JavaSource js, JTextComponent pane, final i final String[] errorMessage = new String[1]; final boolean proposeCandidates = span[0] == span[1] && type != IntroduceKind.CREATE_METHOD; - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { try { diff --git a/java/java.j2seembedded/nbproject/project.xml b/java/java.j2seembedded/nbproject/project.xml index f6c9451ad8a4..24e4008744dc 100644 --- a/java/java.j2seembedded/nbproject/project.xml +++ b/java/java.j2seembedded/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.extexecution diff --git a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/RemotePlatformNode.java b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/RemotePlatformNode.java index 0cd99dc48e2a..65c3aa2a1e3a 100644 --- a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/RemotePlatformNode.java +++ b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/RemotePlatformNode.java @@ -40,7 +40,7 @@ import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.java.queries.SourceLevelQuery; import org.netbeans.api.java.queries.SourceLevelQuery.Profile; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; import org.openide.WizardValidationException; @@ -559,7 +559,7 @@ public Component getCustomizer() { test.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ProgressUtils.showProgressDialogAndRun(new Runnable() { + BaseProgressUtils.showProgressDialogAndRun(new Runnable() { @Override public void run() { try { diff --git a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/wizard/SetUpRemotePlatform.java b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/wizard/SetUpRemotePlatform.java index 3a438d62d5b5..5f061cae2e19 100644 --- a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/wizard/SetUpRemotePlatform.java +++ b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/wizard/SetUpRemotePlatform.java @@ -39,7 +39,7 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressRunnable; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.java.j2seembedded.platform.ConnectionMethod; import org.netbeans.modules.java.j2seembedded.platform.RemotePlatformProbe; import org.netbeans.modules.java.j2seembedded.platform.RemotePlatformProvider; @@ -464,7 +464,7 @@ private void buttonCreateActionPerformed(java.awt.event.ActionEvent evt) {//GEN- new File(keyFilePath.getText()), String.valueOf(passphrase.getPassword())); } - ProgressUtils.showProgressDialogAndRun( + BaseProgressUtils.showProgressDialogAndRun( new ProgressRunnable() { @Override public Void run(ProgressHandle handle) { diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformCustomizer.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformCustomizer.java index 192a574621f2..5d69e64fb8ae 100644 --- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformCustomizer.java +++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformCustomizer.java @@ -31,13 +31,11 @@ import java.util.Collection; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.net.URL; import java.net.URI; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; @@ -69,7 +67,7 @@ import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressRunnable; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.java.j2seplatform.platformdefinition.jrtfs.NBJRTUtil; import org.netbeans.spi.java.classpath.PathResourceImplementation; import org.netbeans.spi.java.classpath.support.ClassPathSupport; @@ -78,9 +76,6 @@ import org.openide.filesystems.FileObject; import org.openide.filesystems.URLMapper; import org.openide.loaders.DataFolder; -import org.openide.modules.SpecificationVersion; -import org.openide.nodes.AbstractNode; -import org.openide.nodes.Children; import org.openide.util.Cancellable; import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; @@ -691,7 +686,7 @@ public boolean cancel() { } } final ProgressRunnable task = new Task(); - ProgressUtils.showProgressDialogAndRun(task, Bundle.TXT_JavadocSearch(file.getAbsolutePath()), false); + BaseProgressUtils.showProgressDialogAndRun(task, Bundle.TXT_JavadocSearch(file.getAbsolutePath()), false); } if (!result.isEmpty()) { return result.stream() diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java index ea53cd2764da..2ff3bce6e2e6 100644 --- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java +++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java @@ -476,7 +476,7 @@ public void readSettings(WizardDescriptor settings) { this.component.progressPanel.setVisible (true); this.component.progressLabel.setVisible (true); - this.progressHandle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DetectPanel.class,"TXT_PlatfromDetectProgress")); + this.progressHandle = ProgressHandle.createHandle(NbBundle.getMessage(DetectPanel.class,"TXT_PlatfromDetectProgress")); this.component.progressPanel.removeAll(); this.component.progressPanel.setLayout (new GridBagLayout ()); GridBagConstraints c = new GridBagConstraints (); diff --git a/java/java.navigation/nbproject/project.xml b/java/java.navigation/nbproject/project.xml index 64d4fe8458f8..225e8b8d1729 100644 --- a/java/java.navigation/nbproject/project.xml +++ b/java/java.navigation/nbproject/project.xml @@ -61,14 +61,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.multiview diff --git a/java/java.navigation/src/org/netbeans/modules/java/navigation/hierarchy/HierarchyTopComponent.java b/java/java.navigation/src/org/netbeans/modules/java/navigation/hierarchy/HierarchyTopComponent.java index fc4e0234bf31..ba580db96fe0 100644 --- a/java/java.navigation/src/org/netbeans/modules/java/navigation/hierarchy/HierarchyTopComponent.java +++ b/java/java.navigation/src/org/netbeans/modules/java/navigation/hierarchy/HierarchyTopComponent.java @@ -66,7 +66,6 @@ import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.Task; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.settings.ConvertAsProperties; import org.netbeans.editor.Utilities; import org.netbeans.modules.java.navigation.JavadocTopComponent; @@ -532,7 +531,7 @@ public void run(CompilationController cc) throws Exception { filters); } else { final AtomicBoolean cancel = new AtomicBoolean(); - final ProgressHandle progress = ProgressHandleFactory.createHandle( + final ProgressHandle progress = ProgressHandle.createHandle( Bundle.INFO_SubClassesComputation(te.getQualifiedName()), new Cancellable() { @Override diff --git a/java/java.project.ui/nbproject/project.xml b/java/java.project.ui/nbproject/project.xml index fda67d348390..218105bc6784 100644 --- a/java/java.project.ui/nbproject/project.xml +++ b/java/java.project.ui/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.search diff --git a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageView.java b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageView.java index 72432107bdc8..689565b87367 100644 --- a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageView.java +++ b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageView.java @@ -44,7 +44,6 @@ import javax.swing.plaf.UIResource; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.queries.VisibilityQuery; import org.netbeans.modules.java.project.ui.JavaProjectSettings; @@ -162,7 +161,7 @@ static Action[] createRootNodeActions() { @Messages({"# {0} - root folder", "PackageView.find_packages_progress=Finding packages in {0}"}) static void findNonExcludedPackages(PackageViewChildren children, Collection target, FileObject fo, SourceGroup group, boolean showProgress) { if (showProgress) { - ProgressHandle progress = ProgressHandleFactory.createHandle(PackageView_find_packages_progress(FileUtil.getFileDisplayName(fo))); + ProgressHandle progress = ProgressHandle.createHandle(PackageView_find_packages_progress(FileUtil.getFileDisplayName(fo))); progress.start(1000); findNonExcludedPackages(children, target, fo, group, progress, 0, 1000); progress.finish(); diff --git a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageViewChildren.java b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageViewChildren.java index 8e885951f428..ffe6c23f4f53 100644 --- a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageViewChildren.java +++ b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/PackageViewChildren.java @@ -42,7 +42,6 @@ import org.netbeans.api.fileinfo.NonRecursiveFolder; import org.netbeans.api.java.queries.AccessibilityQuery; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.queries.VisibilityQuery; @@ -1332,7 +1331,7 @@ public Transferable paste() throws IOException { PackageRootNode.PKG_VIEW_RP.post(new java.lang.Runnable() { @Override public void run() { - final ProgressHandle h = ProgressHandleFactory.createHandle(getName()); + final ProgressHandle h = ProgressHandle.createHandle(getName()); h.start(); h.switchToIndeterminate(); try { diff --git a/java/java.source.base/nbproject/project.xml b/java/java.source.base/nbproject/project.xml index cd71868b2ee5..47e43422d6d8 100644 --- a/java/java.source.base/nbproject/project.xml +++ b/java/java.source.base/nbproject/project.xml @@ -296,9 +296,6 @@ unit - - org.netbeans.api.progress.nb - org.netbeans.core.startup diff --git a/java/java.source/nbproject/project.xml b/java/java.source/nbproject/project.xml index 4d161b2bf189..07ae9ca032a0 100644 --- a/java/java.source/nbproject/project.xml +++ b/java/java.source/nbproject/project.xml @@ -61,14 +61,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/java/java.source/src/org/netbeans/modules/java/ClassDataObject.java b/java/java.source/src/org/netbeans/modules/java/ClassDataObject.java index 161f2f27db6d..c0973ae3bea1 100644 --- a/java/java.source/src/org/netbeans/modules/java/ClassDataObject.java +++ b/java/java.source/src/org/netbeans/modules/java/ClassDataObject.java @@ -19,20 +19,18 @@ package org.netbeans.modules.java; -import java.net.URL; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; -import javax.lang.model.element.TypeElement; import org.netbeans.api.java.classpath.ClassPath; import org.netbeans.api.java.platform.JavaPlatformManager; import org.netbeans.api.java.source.ClasspathInfo; import org.netbeans.api.java.source.ElementHandle; import org.netbeans.api.java.source.SourceUtils; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.spi.java.classpath.support.ClassPathSupport; import org.openide.awt.StatusDisplayer; import org.openide.cookies.OpenCookie; @@ -79,7 +77,7 @@ private final class OpenSourceCookie implements OpenCookie { @Override public void open() { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(() -> { + BaseProgressUtils.runOffEventDispatchThread(() -> { try { FileObject fo = getPrimaryFile(); FileObject binaryRoot = null; diff --git a/java/java.sourceui/nbproject/project.xml b/java/java.sourceui/nbproject/project.xml index f1bb6375971b..e1dbf54c629e 100644 --- a/java/java.sourceui/nbproject/project.xml +++ b/java/java.sourceui/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.lib.nbjavac diff --git a/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java b/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java index f561cb51c8cf..d66c077c67cf 100644 --- a/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java +++ b/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java @@ -41,7 +41,7 @@ import org.netbeans.api.java.platform.JavaPlatform; import org.netbeans.api.java.queries.SourceJavadocAttacher; import org.netbeans.api.java.source.*; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.modules.java.BinaryElementOpen; import org.netbeans.modules.java.classfile.CodeGenerator; import org.netbeans.modules.java.source.JavaSourceAccessor; @@ -96,7 +96,7 @@ public static boolean open(final ClasspathInfo cpInfo, final ElementHandle1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.multiview diff --git a/java/junit/src/org/netbeans/modules/junit/ProgressIndicator.java b/java/junit/src/org/netbeans/modules/junit/ProgressIndicator.java index b91a4833849d..437da1de1b11 100644 --- a/java/junit/src/org/netbeans/modules/junit/ProgressIndicator.java +++ b/java/junit/src/org/netbeans/modules/junit/ProgressIndicator.java @@ -20,7 +20,6 @@ package org.netbeans.modules.junit; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.awt.StatusDisplayer; import org.openide.util.Cancellable; import org.openide.util.NbBundle; @@ -45,7 +44,7 @@ final class ProgressIndicator implements Cancellable { ProgressIndicator() { String msg = NbBundle.getMessage(ProgressIndicator.class, "LBL_generator_progress_title");//NOI18N - progressHandle = ProgressHandleFactory.createHandle(msg); + progressHandle = ProgressHandle.createHandle(msg); } public boolean cancel() { diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml index 5cf6da61edf3..004643c125b0 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -47,14 +47,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.projectapi diff --git a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/exec/ProgressTransferListener.java b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/exec/ProgressTransferListener.java index 8dc6930a6ec9..56fde494e698 100644 --- a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/exec/ProgressTransferListener.java +++ b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/exec/ProgressTransferListener.java @@ -21,7 +21,7 @@ import java.util.Stack; import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.progress.aggregate.AggregateProgressFactory; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; import org.netbeans.api.progress.aggregate.ProgressContributor; import static org.netbeans.modules.maven.embedder.exec.Bundle.*; @@ -56,7 +56,7 @@ public static ProgressTransferListener activeListener() { public static void setAggregateHandle(AggregateProgressHandle hndl) { ProgressTransferListener ptl = activeListener(); ptl.handle = hndl; - ProgressContributor pc = AggregateProgressFactory.createProgressContributor("Pom files"); + ProgressContributor pc = BasicAggregateProgressFactory.createProgressContributor("Pom files"); hndl.addContributor(pc); pc.start(POM_MAX); ptl.pomcontrib = pc; @@ -119,7 +119,7 @@ public void transferInitiated(TransferEvent te) throws TransferCancelledExceptio String name = (te.getRequestType() == TransferEvent.RequestType.GET ? TXT_Download(resName) : TXT_Uploading(resName)); - pc = AggregateProgressFactory.createProgressContributor(name); + pc = BasicAggregateProgressFactory.createProgressContributor(name); handle.addContributor(pc); } contrib = pc; @@ -127,7 +127,7 @@ public void transferInitiated(TransferEvent te) throws TransferCancelledExceptio String name = (te.getRequestType() == TransferEvent.RequestType.GET ? TXT_Download(resName) : TXT_Uploading(resName)); - ProgressContributor pc = AggregateProgressFactory.createProgressContributor(name); + ProgressContributor pc = BasicAggregateProgressFactory.createProgressContributor(name); contribStack.add(pc); handle.addContributor(pc); if (pomCount < POM_MAX - 1) { diff --git a/java/maven.repository/nbproject/project.xml b/java/maven.repository/nbproject/project.xml index 9c738bb42fc9..b5c0634e59fa 100644 --- a/java/maven.repository/nbproject/project.xml +++ b/java/maven.repository/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.ide diff --git a/java/maven.repository/src/org/netbeans/modules/maven/repository/VersionNode.java b/java/maven.repository/src/org/netbeans/modules/maven/repository/VersionNode.java index 184e2a3409f7..774b768515ed 100644 --- a/java/maven.repository/src/org/netbeans/modules/maven/repository/VersionNode.java +++ b/java/maven.repository/src/org/netbeans/modules/maven/repository/VersionNode.java @@ -34,8 +34,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; -import org.netbeans.api.annotations.common.StaticResource; -import org.netbeans.api.progress.aggregate.AggregateProgressFactory; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.modules.maven.indexer.api.NBVersionInfo; @@ -265,8 +264,8 @@ private class DownloadAction extends AbstractAction { RP.post(new Runnable() { public @Override void run() { MavenEmbedder online = EmbedderFactory.getOnlineEmbedder(); - AggregateProgressHandle hndl = AggregateProgressFactory.createHandle(DownloadAction_downloading(art.getId()), - new ProgressContributor[] {AggregateProgressFactory.createProgressContributor("")}, + AggregateProgressHandle hndl = BasicAggregateProgressFactory.createHandle(DownloadAction_downloading(art.getId()), + new ProgressContributor[] {BasicAggregateProgressFactory.createProgressContributor("")}, ProgressTransferListener.cancellable(), null); ProgressTransferListener.setAggregateHandle(hndl); try { diff --git a/java/maven.repository/src/org/netbeans/modules/maven/repository/ui/ArtifactMultiViewFactory.java b/java/maven.repository/src/org/netbeans/modules/maven/repository/ui/ArtifactMultiViewFactory.java index 500f603b465c..263d0900d345 100644 --- a/java/maven.repository/src/org/netbeans/modules/maven/repository/ui/ArtifactMultiViewFactory.java +++ b/java/maven.repository/src/org/netbeans/modules/maven/repository/ui/ArtifactMultiViewFactory.java @@ -44,7 +44,7 @@ import org.netbeans.api.annotations.common.CheckForNull; import org.netbeans.api.annotations.common.NonNull; import org.netbeans.api.annotations.common.NullAllowed; -import org.netbeans.api.progress.aggregate.AggregateProgressFactory; +import org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressHandle; import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.api.project.Project; @@ -143,9 +143,9 @@ public final class ArtifactMultiViewFactory implements ArtifactViewerFactory { @Override public void run() { MavenEmbedder embedder = EmbedderFactory.getOnlineEmbedder(); - AggregateProgressHandle hndl = AggregateProgressFactory.createHandle(Progress_Download(artifact.getId()), + AggregateProgressHandle hndl = BasicAggregateProgressFactory.createHandle(Progress_Download(artifact.getId()), new ProgressContributor[] { - AggregateProgressFactory.createProgressContributor("zaloha") }, //NOI18N + BasicAggregateProgressFactory.createProgressContributor("zaloha") }, //NOI18N ProgressTransferListener.cancellable(), null); ProgressTransferListener.setAggregateHandle(hndl); hndl.start(); diff --git a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/wizard/ProgressPanel.java b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/wizard/ProgressPanel.java index 151083846161..40c64a219f9f 100644 --- a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/wizard/ProgressPanel.java +++ b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/wizard/ProgressPanel.java @@ -43,7 +43,7 @@ public final class ProgressPanel extends JPanel { /** Creates new form ProgressPanel */ public ProgressPanel() { initComponents(); - handle = ProgressHandleFactory.createHandle( + handle = ProgressHandle.createHandle( NbBundle.getMessage(ImportProjectAction.class, "CTL_ProgressDialogTitle")); // NOI18N progress = ProgressHandleFactory.createProgressComponent(handle); setLayout(new GridBagLayout()); diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java index 76c6e2005b55..89fc852ef6a5 100644 --- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java +++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/InstantRefactoringPerformer.java @@ -635,7 +635,7 @@ public void run() { stop(event); } - progressBar = ProgressBar.create(progressHandle = ProgressHandleFactory.createHandle("")); //NOI18N + progressBar = ProgressBar.create(progressHandle = ProgressHandle.createHandle("")); //NOI18N if (event.getCount() == -1) { isIndeterminate = true; progressHandle.start(); diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ComputeOffAWT.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ComputeOffAWT.java index 7055ae29d0c2..f05fb5c865b0 100644 --- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ComputeOffAWT.java +++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ComputeOffAWT.java @@ -26,7 +26,7 @@ import org.netbeans.api.java.source.JavaSource; import org.netbeans.api.java.source.JavaSource.Phase; import org.netbeans.api.java.source.Task; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.openide.util.Exceptions; /** @@ -39,7 +39,7 @@ public static T computeOffAWT(Worker w, String featureName, final JavaSou AtomicBoolean cancel = new AtomicBoolean(); Compute c = new Compute(cancel, source, phase, w); - ProgressUtils.runOffEventDispatchThread(c, featureName, cancel, false); + BaseProgressUtils.runOffEventDispatchThread(c, featureName, cancel, false); return c.result; } diff --git a/java/spi.java.hints/nbproject/project.xml b/java/spi.java.hints/nbproject/project.xml index ac8c0a9c8000..e543c2f4fe8a 100644 --- a/java/spi.java.hints/nbproject/project.xml +++ b/java/spi.java.hints/nbproject/project.xml @@ -61,14 +61,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.lib.nbjavac diff --git a/java/spring.beans/nbproject/project.xml b/java/spring.beans/nbproject/project.xml index 3e48bb95890d..9ffb344da351 100644 --- a/java/spring.beans/nbproject/project.xml +++ b/java/spring.beans/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.xml diff --git a/java/spring.beans/src/org/netbeans/modules/spring/java/JavaUtils.java b/java/spring.beans/src/org/netbeans/modules/spring/java/JavaUtils.java index ea16458c39b5..1cdabe021fe6 100644 --- a/java/spring.beans/src/org/netbeans/modules/spring/java/JavaUtils.java +++ b/java/spring.beans/src/org/netbeans/modules/spring/java/JavaUtils.java @@ -59,7 +59,7 @@ import org.netbeans.api.java.source.Task; import org.netbeans.api.java.source.ui.ElementOpen; import org.netbeans.api.java.source.ui.ScanDialog; -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.ProjectUtils; @@ -318,11 +318,11 @@ public static void findAndOpenJavaClass(final String classBinaryName, FileObject ScanDialog.runWhenScanFinished(new Runnable() { @Override public void run() { - ProgressUtils.runOffEventDispatchThread(classFinder, Bundle.JavaUtils_title_class_searching(), cancel, false); + BaseProgressUtils.runOffEventDispatchThread(classFinder, Bundle.JavaUtils_title_class_searching(), cancel, false); } }, Bundle.JavaUtils_title_class_searching()); } else { - ProgressUtils.runOffEventDispatchThread(classFinder, Bundle.JavaUtils_title_class_searching(), cancel, false); + BaseProgressUtils.runOffEventDispatchThread(classFinder, Bundle.JavaUtils_title_class_searching(), cancel, false); } } } diff --git a/java/testng.ui/nbproject/project.xml b/java/testng.ui/nbproject/project.xml index fc2864d7df93..1e1581cedddb 100644 --- a/java/testng.ui/nbproject/project.xml +++ b/java/testng.ui/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/TestNGSuiteHyperlingProvider.java b/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/TestNGSuiteHyperlingProvider.java index 1ff9bbfca476..598f39d98e2a 100644 --- a/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/TestNGSuiteHyperlingProvider.java +++ b/java/testng.ui/src/org/netbeans/modules/testng/ui/wizards/TestNGSuiteHyperlingProvider.java @@ -42,7 +42,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.xml.lexer.XMLTokenId; import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider; import org.netbeans.modules.editor.NbEditorUtilities; @@ -160,7 +160,7 @@ public int[] getHyperlinkSpan(Document doc, int offset) { public void performClickAction(final Document doc, final int offset) { final AtomicBoolean cancel = new AtomicBoolean(); - ProgressUtils.runOffEventDispatchThread(new Runnable() { + BaseProgressUtils.runOffEventDispatchThread(new Runnable() { public void run() { performGoTo(doc, offset, file, method, targetType, cancel); diff --git a/java/testng/nbproject/project.xml b/java/testng/nbproject/project.xml index 93b37bd39db3..1db27a53c48e 100644 --- a/java/testng/nbproject/project.xml +++ b/java/testng/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.xml diff --git a/java/testng/src/org/netbeans/modules/testng/ProgressIndicator.java b/java/testng/src/org/netbeans/modules/testng/ProgressIndicator.java index b7be5844f25a..77aafd4daa3f 100644 --- a/java/testng/src/org/netbeans/modules/testng/ProgressIndicator.java +++ b/java/testng/src/org/netbeans/modules/testng/ProgressIndicator.java @@ -20,7 +20,6 @@ package org.netbeans.modules.testng; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.awt.StatusDisplayer; import org.openide.util.Cancellable; import org.openide.util.NbBundle; @@ -47,7 +46,7 @@ final class ProgressIndicator implements Cancellable { // String msg = NbBundle.getMessage(ProgressIndicator.class, // "LBL_generator_progress_title");//NOI18N String msg = Bundle.LBL_generator_progress_title(); - progressHandle = ProgressHandleFactory.createHandle(msg); + progressHandle = ProgressHandle.createHandle(msg); } public boolean cancel() { diff --git a/java/xml.jaxb/nbproject/project.xml b/java/xml.jaxb/nbproject/project.xml index 449762d04624..c5561fb6b50b 100644 --- a/java/xml.jaxb/nbproject/project.xml +++ b/java/xml.jaxb/nbproject/project.xml @@ -61,14 +61,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.javacapi diff --git a/java/xml.jaxb/src/org/netbeans/modules/xml/jaxb/util/ProjectHelper.java b/java/xml.jaxb/src/org/netbeans/modules/xml/jaxb/util/ProjectHelper.java index 94baa53784ae..aa4a103ed71b 100644 --- a/java/xml.jaxb/src/org/netbeans/modules/xml/jaxb/util/ProjectHelper.java +++ b/java/xml.jaxb/src/org/netbeans/modules/xml/jaxb/util/ProjectHelper.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.ErrorManager; import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.transform.OutputKeys; @@ -48,7 +47,6 @@ import org.netbeans.api.java.project.JavaProjectConstants; import org.netbeans.api.java.project.classpath.ProjectClassPathModifier; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectInformation; import org.netbeans.api.project.ProjectManager; @@ -945,7 +943,7 @@ private static void executeAntTarget(final Project project, final boolean addLibs, final String antTarget, TaskListener listener ) { - final ProgressHandle progressHandle = ProgressHandleFactory + final ProgressHandle progressHandle = ProgressHandle .createHandle(NbBundle.getMessage(ProjectHelper.class, "MSG_JAXB_PROGRESS")); //NOI18N; progressHandle.start(); diff --git a/javafx/javafx2.project/nbproject/project.xml b/javafx/javafx2.project/nbproject/project.xml index 2900a9de99c7..00520720d04d 100644 --- a/javafx/javafx2.project/nbproject/project.xml +++ b/javafx/javafx2.project/nbproject/project.xml @@ -70,14 +70,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.scripting diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JSEDeploymentPanel.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JSEDeploymentPanel.java index 4349bd8a6627..7626b353ea9a 100644 --- a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JSEDeploymentPanel.java +++ b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JSEDeploymentPanel.java @@ -27,7 +27,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.progress.ProgressUtils; +import org.netbeans.api.progress.BaseProgressUtils; import org.netbeans.api.project.Project; import org.netbeans.modules.java.api.common.project.ui.customizer.CustomizerProvider3; import org.netbeans.modules.javafx2.project.JFXProjectProperties; @@ -231,7 +231,7 @@ public void stateChanged(ChangeEvent e) { CustomizerProvider3 canceller = project.getLookup().lookup(CustomizerProvider3.class); if(canceller != null) { canceller.cancelCustomizer(); - ProgressUtils.showProgressDialogAndRun(new Runnable() { + BaseProgressUtils.showProgressDialogAndRun(new Runnable() { @Override public void run() { try { diff --git a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java index 039a16971529..195de19a1d3e 100644 --- a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java +++ b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/ImportManager.java @@ -237,7 +237,7 @@ private boolean doImport () { } } if (reallyToImport.size() > 0) { - final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(ImportManager.class, ("ImportManager.Progress.Name"))); + final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(ImportManager.class, ("ImportManager.Progress.Name"))); final JComponent progressComp = ProgressHandleFactory.createProgressComponent(handle); final JLabel detailLabel = new JLabel(NbBundle.getMessage(ImportManager.class, "ImportManager.Progress.Label")); detailLabel.setHorizontalAlignment(SwingConstants.LEFT); diff --git a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java index 95a6abd0dd3e..c42dadc8c5c4 100644 --- a/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java +++ b/nb/autoupdate.pluginimporter/src/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/JUnitLibraryInstaller.java @@ -42,7 +42,6 @@ import org.netbeans.api.autoupdate.UpdateUnitProvider; import org.netbeans.api.autoupdate.UpdateUnitProviderFactory; import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.api.progress.ProgressHandleFactory; import static org.netbeans.modules.autoupdate.pluginimporter.libinstaller.Bundle.*; import org.netbeans.modules.autoupdate.ui.api.PluginManager; import org.openide.DialogDescriptor; @@ -148,13 +147,13 @@ public static void install(boolean silent) { private static void install(OperationContainer oc, UpdateElement jUnitElement, UpdateUnit jUnitLib, boolean useUserdirAsFallback) throws OperationException { // download LOG.log(Level.FINE, "Try to download {0}", jUnitElement); - ProgressHandle downloadHandle = ProgressHandleFactory.createHandle (download_handle()); + ProgressHandle downloadHandle = ProgressHandle.createHandle (download_handle()); Validator validator = oc.getSupport().doDownload(downloadHandle, null, useUserdirAsFallback); // install - ProgressHandle validateHandle = ProgressHandleFactory.createHandle (validate_handle()); + ProgressHandle validateHandle = ProgressHandle.createHandle (validate_handle()); Installer installer = oc.getSupport().doValidate(validator, validateHandle); LOG.log(Level.FINE, "Try to install {0}", jUnitElement); - ProgressHandle installHandle = ProgressHandleFactory.createHandle (install_handle()); + ProgressHandle installHandle = ProgressHandle.createHandle (install_handle()); Restarter restarter = oc.getSupport().doInstall(installer, installHandle); assert restarter == null : "Not need to restart while installing " + jUnitLib; LOG.log(Level.FINE, "Done {0}", jUnitElement); diff --git a/php/php.api.executable/nbproject/project.xml b/php/php.api.executable/nbproject/project.xml index 99fbce4446bd..bf30d673f254 100644 --- a/php/php.api.executable/nbproject/project.xml +++ b/php/php.api.executable/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.extexecution diff --git a/php/php.dbgp/nbproject/project.xml b/php/php.dbgp/nbproject/project.xml index f5f5b12b9324..c74f7715e77b 100644 --- a/php/php.dbgp/nbproject/project.xml +++ b/php/php.dbgp/nbproject/project.xml @@ -52,14 +52,6 @@ 1.46 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.csl.api diff --git a/php/php.phing/nbproject/project.xml b/php/php.phing/nbproject/project.xml index 46e615bce831..c47dbad64bf4 100644 --- a/php/php.phing/nbproject/project.xml +++ b/php/php.phing/nbproject/project.xml @@ -43,14 +43,6 @@ 1.43 - - org.netbeans.api.progress.nb - - - - 1.42 - - org.netbeans.api.templates diff --git a/platform/api.progress.nb/src/org/netbeans/api/progress/aggregate/AggregateProgressFactory.java b/platform/api.progress.nb/src/org/netbeans/api/progress/aggregate/AggregateProgressFactory.java index 7da3e377ee39..9018e098ab2d 100644 --- a/platform/api.progress.nb/src/org/netbeans/api/progress/aggregate/AggregateProgressFactory.java +++ b/platform/api.progress.nb/src/org/netbeans/api/progress/aggregate/AggregateProgressFactory.java @@ -22,7 +22,6 @@ import javax.swing.Action; import javax.swing.JComponent; import javax.swing.JLabel; -import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.util.Cancellable; diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ModuleInstallerSupport.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ModuleInstallerSupport.java index 6565b6634ce0..d0d75b0be1fb 100644 --- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ModuleInstallerSupport.java +++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/ModuleInstallerSupport.java @@ -208,7 +208,7 @@ public void run() { } if (oc != null) { - ProgressHandle activeHandle = ProgressHandleFactory.createHandle( + ProgressHandle activeHandle = ProgressHandle.createHandle( displayName != null ? active_handle_single(displayName) : active_handle()); Restarter restarter = oc.getSupport().doOperation(activeHandle); assert restarter == null : "No Restater need to make units active"; diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitTab.form b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitTab.form index 39b3827bb111..38a788e29341 100644 --- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitTab.form +++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/UnitTab.form @@ -1,4 +1,5 @@ +