From 82ae1a4354fc2f43cf7925ca00e84ae0653ed0f1 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Thu, 16 Oct 2025 11:19:32 +0200 Subject: [PATCH 1/3] [1/3] Removed deprecated ProgressHandleFactory::createHandle usage use ProgressHandle instead --- .../ui/customizer/ClusterizeVisualPanel1.java | 2 +- ...tSuiteProjectOperationsImplementation.java | 7 +------ .../wizard/winsys/LayoutLaunchingPanel.java | 2 +- .../apisupport/MavenPlatformJarProvider.java | 3 +-- .../actions/ResolvePluginsAction.java | 3 +-- .../plugins/GrailsPluginSupport.java | 3 +-- .../actions/UndeployModuleCookieImpl.java | 3 +-- .../wsitconf/design/ConfigRunnable.java | 2 +- .../wsitconf/wizard/STSWizardCreator.java | 4 +--- .../glassfish/common/CreateDomain.java | 3 +-- .../j2ee/deployment/impl/ui/ProgressUI.java | 2 +- .../jaxws/actions/AddWsOperationHelper.java | 3 +-- .../nodes/ClientHandlerButtonListener.java | 4 +--- .../jaxws/wizards/JaxWsServiceCreator.java | 5 ++--- .../modules/payara/common/CreateDomain.java | 3 +-- .../facelets/FaceletsLibrarySupport.java | 3 +-- .../web/jsf/navigation/PageFlowView.java | 3 +-- .../websvc/core/AddWsOperationHelper.java | 4 +--- .../client/wizard/JaxWsClientCreator.java | 3 +-- .../core/dev/wizard/JaxWsServiceCreator.java | 5 ++--- .../nodes/ClientHandlerButtonListener.java | 4 +--- .../core/ui/CustomizationWSEditor.java | 4 +--- .../light/CustomizationWSEditor.java | 3 +-- .../view/actions/RemoveOperationAction.java | 4 +--- .../rest/client/ClientJavaSourceHelper.java | 4 +--- .../websvc/rest/wizard/ProgressDialog.java | 2 +- .../ide/ergonomics/newproject/EnableStep.java | 2 +- .../modules/analysis/RunAnalysis.java | 3 +-- .../modules/analysis/spi/AnalyzerTest.java | 3 +-- .../db/sql/loader/SQLEditorSupport.java | 3 +-- .../dataview/output/SQLStatementExecutor.java | 3 +-- .../db/mysql/impl/MySQLDatabaseServer.java | 5 ++--- .../modules/db/mysql/impl/StartManager.java | 3 +-- .../modules/db/mysql/impl/StopManager.java | 3 +-- .../modules/db/explorer/DbUtilities.java | 2 +- .../db/explorer/dlg/AddDriverDialog.java | 2 +- .../modules/db/explorer/dlg/ConnectPanel.java | 2 +- .../db/explorer/dlg/NewConnectionPanel.java | 3 +-- .../modules/db/explorer/dlg/SchemaPanel.java | 2 +- .../netbeans/modules/derby/RegisterDerby.java | 7 ++----- .../modules/docker/ui/build2/BuildTask.java | 5 +---- .../modules/docker/ui/node/PushTagAction.java | 3 +-- .../docker/ui/pull/PullImageAction.java | 3 +-- .../global/format/GlobalFormatAction.java | 3 +-- .../git/client/GitProgressSupport.java | 4 ++-- .../ui/TestMethodDebuggerAction.java | 5 +---- .../testrunner/ui/TestMethodRunnerAction.java | 3 +-- .../ui/api/TestMethodDebuggerProvider.java | 3 +-- .../ui/api/TestMethodRunnerProvider.java | 3 +-- .../validation/NbValidationTransaction.java | 3 +-- .../ui/actions/AddTestInstanceAction.java | 3 +-- .../hudson/impl/HudsonInstanceImpl.java | 3 +-- .../modules/hudson/impl/HudsonJobImpl.java | 3 +-- .../modules/mercurial/HgProgressSupport.java | 6 +----- .../mercurial/ui/status/VersioningPanel.form | 2 +- .../mercurial/ui/status/VersioningPanel.java | 3 +-- .../project/uiapi/CustomizerDialog.java | 2 +- ...efaultProjectOperationsImplementation.java | 13 ++++--------- ...ltProjectOperationsImplementationTest.java | 19 +++++++++---------- .../refactoring/spi/impl/ParametersPanel.java | 2 +- .../spi/impl/RefactoringPanel.java | 6 +++--- .../subversion/client/SvnProgressSupport.java | 5 ++--- .../subversion/ui/status/VersioningPanel.java | 3 +-- .../tasklist/ui/TaskListTopComponent.form | 1 - .../tasklist/ui/TaskListTopComponent.java | 3 +-- .../bugtracking/commons/AttachmentsPanel.java | 10 ++++------ .../ui/history/HistoryDiffView.java | 2 +- .../versioning/util/ExportDiffSupport.java | 3 +-- .../retriever/impl/RetrieverEngineImpl.java | 3 +-- .../jdbcimpl/wizard/DBSchemaTablesPanel.java | 2 +- .../jdbcimpl/wizard/ProgressFrame.java | 2 +- .../actions/TakeScreenshotActionProvider.java | 3 +-- .../modules/nbform/SwingAppLibDownloader.java | 4 ++-- .../modules/form/BindingCustomizer.java | 2 +- .../api/support/progress/ProgressSupport.java | 2 +- .../jpqleditor/ui/JPQLEditorTopComponent.java | 2 +- .../modules/java/hints/analyzer/Analyzer.java | 5 +---- .../java/j2seplatform/wizard/DetectPanel.java | 2 +- .../hierarchy/HierarchyTopComponent.java | 3 +-- .../java/project/support/ui/PackageView.java | 3 +-- .../support/ui/PackageViewChildren.java | 3 +-- .../modules/junit/ProgressIndicator.java | 3 +-- .../eclipse/core/wizard/ProgressPanel.java | 2 +- .../plugins/InstantRefactoringPerformer.java | 2 +- .../modules/testng/ProgressIndicator.java | 3 +-- .../modules/xml/jaxb/util/ProjectHelper.java | 4 +--- .../pluginimporter/ImportManager.java | 2 +- .../libinstaller/JUnitLibraryInstaller.java | 7 +++---- .../autoupdate/ui/ModuleInstallerSupport.java | 2 +- .../modules/autoupdate/ui/UnitTab.form | 4 +--- .../modules/autoupdate/ui/UnitTab.java | 5 +---- .../modules/autoupdate/ui/Utilities.java | 4 ++-- .../ui/actions/AutoupdateCheckScheduler.java | 2 +- .../ui/wizards/CustomHandleStep.java | 2 +- .../autoupdate/ui/wizards/InstallStep.java | 18 +++++++++--------- .../ui/wizards/PanelBodyContainer.java | 2 +- .../autoupdate/ui/wizards/UninstallStep.java | 6 +++--- .../core/execution/PendingTaskTest.java | 3 +-- .../netbeans/modules/javahelp/JavaHelp.java | 2 +- .../src/org/openide/WizardDescriptor.java | 4 ++-- .../options/export/OptionsChooserPanel.java | 3 +-- .../modules/progress/ui/RunOffEDTImpl.java | 8 ++++---- .../progress/ui/RunOffEDTImplTest.java | 3 +-- .../quicksearch/recent/RecentSearches.java | 3 +-- .../netbeans/modules/uihandler/Installer.java | 3 +-- .../platforms/api/WebKitDebuggingSupport.java | 2 +- .../wizard/ui/OnlineSampleVisualPanel.java | 4 +--- .../clientproject/ClientSideProjectTest.java | 4 ++-- .../saas/codegen/ui/ProgressDialog.java | 2 +- 109 files changed, 149 insertions(+), 251 deletions(-) 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/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/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/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/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/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/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/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.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/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/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/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/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/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/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/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/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/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/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/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.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/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/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/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/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/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/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/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/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/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/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/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/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.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.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.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.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.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.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.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/junit/nbproject/project.xml b/java/junit/nbproject/project.xml index 63122204648b..872603634882 100644 --- a/java/junit/nbproject/project.xml +++ b/java/junit/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.core.multiview 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.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/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/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/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/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/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/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/keyring/nbproject/project.xml b/platform/keyring/nbproject/project.xml index 06589516c7c9..7c391983ebff 100644 --- a/platform/keyring/nbproject/project.xml +++ b/platform/keyring/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.openide.util.ui diff --git a/platform/spi.quicksearch/nbproject/project.xml b/platform/spi.quicksearch/nbproject/project.xml index 7ef05d5e2b79..d6f03976de0c 100644 --- a/platform/spi.quicksearch/nbproject/project.xml +++ b/platform/spi.quicksearch/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.openide.awt diff --git a/platform/uihandler/nbproject/project.xml b/platform/uihandler/nbproject/project.xml index 199ccebd5d9f..325cb5a69b3f 100644 --- a/platform/uihandler/nbproject/project.xml +++ b/platform/uihandler/nbproject/project.xml @@ -34,14 +34,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.lib.uihandler diff --git a/webcommon/cordova.platforms.android/nbproject/project.xml b/webcommon/cordova.platforms.android/nbproject/project.xml index adbdbcc4f5ab..bc8b70a74b19 100644 --- a/webcommon/cordova.platforms.android/nbproject/project.xml +++ b/webcommon/cordova.platforms.android/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.json_simple diff --git a/webcommon/cordova.platforms/nbproject/project.xml b/webcommon/cordova.platforms/nbproject/project.xml index 4cc46d431fab..1f52881c4e2a 100644 --- a/webcommon/cordova.platforms/nbproject/project.xml +++ b/webcommon/cordova.platforms/nbproject/project.xml @@ -52,14 +52,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.json_simple diff --git a/webcommon/cordova/nbproject/project.xml b/webcommon/cordova/nbproject/project.xml index 31b25de9a6bd..ed2dfd7a78e4 100644 --- a/webcommon/cordova/nbproject/project.xml +++ b/webcommon/cordova/nbproject/project.xml @@ -61,14 +61,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/webcommon/javascript.grunt/nbproject/project.xml b/webcommon/javascript.grunt/nbproject/project.xml index a1fc06011df7..6907e7ef5ff0 100644 --- a/webcommon/javascript.grunt/nbproject/project.xml +++ b/webcommon/javascript.grunt/nbproject/project.xml @@ -43,14 +43,6 @@ 1.43 - - org.netbeans.api.progress.nb - - - - 1.42 - - org.netbeans.api.templates diff --git a/webcommon/javascript.gulp/nbproject/project.xml b/webcommon/javascript.gulp/nbproject/project.xml index d1c8ba3b9028..44bbb806485b 100644 --- a/webcommon/javascript.gulp/nbproject/project.xml +++ b/webcommon/javascript.gulp/nbproject/project.xml @@ -43,14 +43,6 @@ 1.43 - - org.netbeans.api.progress.nb - - - - 1.42 - - org.netbeans.api.templates diff --git a/webcommon/javascript.karma/nbproject/project.xml b/webcommon/javascript.karma/nbproject/project.xml index 1ce5740d4777..f63b497f0beb 100644 --- a/webcommon/javascript.karma/nbproject/project.xml +++ b/webcommon/javascript.karma/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.modules.extexecution diff --git a/webcommon/javascript.nodejs/nbproject/project.xml b/webcommon/javascript.nodejs/nbproject/project.xml index 03e92076f7ed..99647bbb9d83 100644 --- a/webcommon/javascript.nodejs/nbproject/project.xml +++ b/webcommon/javascript.nodejs/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/webcommon/web.client.samples/nbproject/project.xml b/webcommon/web.client.samples/nbproject/project.xml index 963af5895313..de39c0fc8f2c 100644 --- a/webcommon/web.client.samples/nbproject/project.xml +++ b/webcommon/web.client.samples/nbproject/project.xml @@ -43,14 +43,6 @@ 1.40 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.templates diff --git a/webcommon/web.clientproject.api/nbproject/project.xml b/webcommon/web.clientproject.api/nbproject/project.xml index 2877cce8feec..10570b17d7c7 100644 --- a/webcommon/web.clientproject.api/nbproject/project.xml +++ b/webcommon/web.clientproject.api/nbproject/project.xml @@ -43,14 +43,6 @@ 1.45 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.libs.json_simple diff --git a/webcommon/web.clientproject/nbproject/project.xml b/webcommon/web.clientproject/nbproject/project.xml index 1458be3120d4..0012a6e9a34f 100644 --- a/webcommon/web.clientproject/nbproject/project.xml +++ b/webcommon/web.clientproject/nbproject/project.xml @@ -52,14 +52,6 @@ 1.45 - - org.netbeans.api.progress.nb - - - - 1.40 - - org.netbeans.api.search