Skip to content

Commit d6b3901

Browse files
mbienmbien
authored
Merge pull request #8927 from mbien/remove-deprecated-progresshandlefactory-usage
Remove deprecated ProgressUtils and ProgresHandleFactory usage
2 parents b535ff5 + e727011 commit d6b3901

File tree

249 files changed

+347
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+347
-983
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.netbeans.api.lexer.Token;
5151
import org.netbeans.api.lexer.TokenHierarchy;
5252
import org.netbeans.api.lexer.TokenSequence;
53-
import org.netbeans.api.progress.ProgressUtils;
53+
import org.netbeans.api.progress.BaseProgressUtils;
5454
import org.netbeans.api.project.FileOwnerQuery;
5555
import org.netbeans.api.project.Project;
5656
import org.netbeans.api.project.ProjectManager;
@@ -377,7 +377,7 @@ public ChangeInfo implement() throws Exception {
377377
SingleModuleProperties props = SingleModuleProperties.getInstance(project);
378378
final ModuleDependency[] newDeps = AddModulePanel.selectDependencies(props, clazz);
379379
final AtomicBoolean cancel = new AtomicBoolean();
380-
ProgressUtils.runOffEventDispatchThread(new Runnable() {
380+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
381381
public @Override
382382
void run() {
383383
ProjectXMLManager pxm = new ProjectXMLManager(project);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import javax.swing.Action;
4141
import javax.swing.Icon;
4242
import javax.swing.ImageIcon;
43-
import org.netbeans.api.progress.ProgressUtils;
43+
import org.netbeans.api.progress.BaseProgressUtils;
4444
import org.netbeans.api.project.Project;
4545
import org.netbeans.api.project.ProjectManager;
4646
import org.netbeans.api.project.ui.OpenProjects;
@@ -557,7 +557,7 @@ public void run() {
557557
}
558558
if(dependencies.size() > 0)
559559
{
560-
ProgressUtils.runOffEventDispatchThread(new Runnable() {
560+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
561561
public @Override void run() {
562562
ProjectXMLManager pxm = new ProjectXMLManager(project);
563563
try {
@@ -613,7 +613,7 @@ public void actionPerformed(ActionEvent ev) {
613613
if (descriptor.getValue().equals(DialogDescriptor.OK_OPTION)) {
614614
final ModuleDependency editedDep = editPanel.getEditedDependency();
615615
final AtomicBoolean cancel = new AtomicBoolean();
616-
ProgressUtils.runOffEventDispatchThread(new Runnable() {
616+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
617617
public @Override void run() {
618618
try {
619619
SortedSet<ModuleDependency> deps = new TreeSet<ModuleDependency>(pxm.getDirectDependencies());

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
import java.util.concurrent.atomic.AtomicBoolean;
2929
import java.util.concurrent.atomic.AtomicReference;
3030
import javax.swing.JDialog;
31-
import org.netbeans.api.progress.ProgressUtils;
31+
import org.netbeans.api.progress.BaseProgressUtils;
3232
import org.netbeans.api.project.Project;
3333
import org.netbeans.api.project.ProjectManager;
3434
import org.netbeans.api.project.ProjectUtils;
35-
import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;
3635
import org.netbeans.spi.project.ui.CustomizerProvider;
3736
import org.netbeans.spi.project.ui.support.ProjectCustomizer;
3837
import org.openide.ErrorManager;
@@ -43,6 +42,8 @@
4342
import org.openide.util.lookup.Lookups;
4443
import org.openide.util.lookup.ProxyLookup;
4544

45+
import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;
46+
4647
/**
4748
* Convenient class to be used by {@link CustomizerProvider} implementations.
4849
*
@@ -110,7 +111,7 @@ public void showCustomizer(String preselectedCategory, final String preselectedS
110111
} else {
111112
final String category = (preselectedCategory != null) ? preselectedCategory : lastSelectedCategory;
112113
final AtomicReference<Lookup> context = new AtomicReference<Lookup>();
113-
ProgressUtils.runOffEventDispatchThread(new Runnable() {
114+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
114115
@Override public void run() {
115116
context.set(new ProxyLookup(prepareData(), Lookups.fixed(new SubCategoryProvider(category, preselectedSubCategory))));
116117
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class ClusterizeVisualPanel1 extends JPanel {
2929

3030
ClusterizeVisualPanel1(ClusterizeWizardPanel1 aThis) {
3131
panel = aThis;
32-
handle = ProgressHandleFactory.createHandle(java.util.ResourceBundle.getBundle("org/netbeans/modules/apisupport/project/ui/customizer/Bundle").getString("MSG_ClusterizeScanning"));
32+
handle = ProgressHandle.createHandle(java.util.ResourceBundle.getBundle("org/netbeans/modules/apisupport/project/ui/customizer/Bundle").getString("MSG_ClusterizeScanning"));
3333
initComponents();
3434
progressPanel.add(BorderLayout.CENTER, ProgressHandleFactory.createProgressComponent(handle));
3535
progressName.add(BorderLayout.CENTER, ProgressHandleFactory.createMainLabelComponent(handle));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import javax.swing.JPanel;
3232
import javax.swing.event.ListSelectionEvent;
3333
import javax.swing.event.ListSelectionListener;
34-
import org.netbeans.api.progress.ProgressUtils;
34+
import org.netbeans.api.progress.BaseProgressUtils;
3535
import org.netbeans.modules.apisupport.project.api.BasicWizardPanel;
3636
import static org.netbeans.modules.apisupport.project.ui.platform.Bundle.*;
3737
import org.netbeans.modules.apisupport.project.universe.NbPlatform;
@@ -84,7 +84,7 @@ public static ActionListener showCustomizerAction() {
8484
})
8585
public static Object showCustomizer() {
8686
final AtomicBoolean canceled = new AtomicBoolean();
87-
ProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
87+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
8888
@Override public void run() {
8989
HarnessUpgrader.checkForUpgrade();
9090
}

‎apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/DefaultSuiteProjectOperationsImplementation.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919

2020
package org.netbeans.modules.apisupport.project.ui.wizard;
2121

22-
import java.awt.BorderLayout;
2322
import java.awt.Component;
2423
import java.awt.Dialog;
25-
import java.awt.GridBagConstraints;
2624
import java.awt.Window;
2725
import java.awt.event.ActionEvent;
2826
import java.awt.event.ActionListener;
@@ -43,8 +41,6 @@
4341
import javax.swing.JButton;
4442
import javax.swing.JComponent;
4543
import javax.swing.JDialog;
46-
import javax.swing.JLabel;
47-
import javax.swing.JPanel;
4844
import javax.swing.KeyStroke;
4945
import javax.swing.SwingUtilities;
5046
import javax.swing.border.EmptyBorder;
@@ -53,7 +49,6 @@
5349
import org.netbeans.api.annotations.common.CheckForNull;
5450
import org.netbeans.api.annotations.common.NullAllowed;
5551
import org.netbeans.api.progress.ProgressHandle;
56-
import org.netbeans.api.progress.ProgressHandleFactory;
5752
import org.netbeans.api.project.Project;
5853
import org.netbeans.api.project.ProjectUtils;
5954
import org.netbeans.api.project.ui.OpenProjects;
@@ -199,7 +194,7 @@ static void deleteProject(final SuiteProject project, UserInputHandler handler)
199194
final Map<NbModuleProject,List<FileObject>> subModulesDataFiles = getSubModulesDataFiles(subModules);
200195

201196

202-
final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption"));
197+
final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption"));
203198
final DefaultSuiteProjectDeletePanel deletePanel = new DefaultSuiteProjectDeletePanel(handle, displayName, FileUtil.getFileDisplayName(projectFolder), !subModulesDataFiles.isEmpty(), !subModules.isEmpty());
204199

205200
String caption = NbBundle.getMessage(DefaultSuiteProjectOperationsImplementation.class, "LBL_Delete_Project_Caption");

‎apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/LayoutLaunchingPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected void readFromDataModel() {
106106
setError(ex.getMessage());
107107
}
108108
if(task != null) {
109-
handle = ProgressHandleFactory.createHandle(Bundle.MSG_LaunchingApplication());
109+
handle = ProgressHandle.createHandle(Bundle.MSG_LaunchingApplication());
110110
JComponent pc = ProgressHandleFactory.createProgressComponent(handle);
111111
JLabel ml = ProgressHandleFactory.createMainLabelComponent(handle);
112112

‎apisupport/maven.apisupport/nbproject/project.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@
7171
<specification-version>1.40</specification-version>
7272
</run-dependency>
7373
</dependency>
74-
<dependency>
75-
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
76-
<build-prerequisite/>
77-
<compile-dependency/>
78-
<run-dependency>
79-
<specification-version>1.40</specification-version>
80-
</run-dependency>
81-
</dependency>
8274
<dependency>
8375
<code-name-base>org.netbeans.api.templates</code-name-base>
8476
<build-prerequisite/>

‎apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenPlatformJarProvider.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
3535
import org.apache.maven.project.MavenProject;
3636
import org.netbeans.api.progress.ProgressHandle;
37-
import org.netbeans.api.progress.ProgressHandleFactory;
3837
import org.netbeans.api.project.Project;
3938
import org.netbeans.modules.apisupport.project.spi.PlatformJarProvider;
4039
import org.netbeans.modules.maven.api.NbMavenProject;
@@ -113,7 +112,7 @@ private void download(List<Artifact> arts, MavenEmbedder online, List<ArtifactRe
113112
if (!toDownload.isEmpty()) {
114113
int cnt = 0;
115114
final AtomicBoolean canceled = new AtomicBoolean();
116-
ProgressHandle h = ProgressHandleFactory.createHandle(Bundle.MavenPlatformJarProvider_downloading(), new Cancellable() {
115+
ProgressHandle h = ProgressHandle.createHandle(Bundle.MavenPlatformJarProvider_downloading(), new Cancellable() {
117116
@Override public boolean cancel() {
118117
canceled.set(true);
119118
return true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.logging.Level;
2727
import java.util.logging.Logger;
2828
import javax.swing.SwingUtilities;
29-
import org.netbeans.api.progress.ProgressUtils;
29+
import org.netbeans.api.progress.BaseProgressUtils;
3030
import org.netbeans.api.project.Project;
3131
import org.netbeans.modules.cordova.platforms.api.WebKitDebuggingSupport;
3232
import org.netbeans.modules.web.browser.api.BrowserSupport;
@@ -137,7 +137,7 @@ public void setURL(final URL url) {
137137
return;
138138
}
139139
try {
140-
ProgressUtils.runOffEventDispatchThread(new Runnable() {
140+
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
141141
@Override
142142
public void run() {
143143
if (kind == Kind.IOS_DEVICE_DEFAULT) {

0 commit comments

Comments
 (0)