Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
Expand Down Expand Up @@ -377,7 +377,7 @@ public ChangeInfo implement() throws Exception {
SingleModuleProperties props = SingleModuleProperties.getInstance(project);
final ModuleDependency[] newDeps = AddModulePanel.selectDependencies(props, clazz);
final AtomicBoolean cancel = new AtomicBoolean();
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
public @Override
void run() {
ProjectXMLManager pxm = new ProjectXMLManager(project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ui.OpenProjects;
Expand Down Expand Up @@ -557,7 +557,7 @@ public void run() {
}
if(dependencies.size() > 0)
{
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
public @Override void run() {
ProjectXMLManager pxm = new ProjectXMLManager(project);
try {
Expand Down Expand Up @@ -613,7 +613,7 @@ public void actionPerformed(ActionEvent ev) {
if (descriptor.getValue().equals(DialogDescriptor.OK_OPTION)) {
final ModuleDependency editedDep = editPanel.getEditedDependency();
final AtomicBoolean cancel = new AtomicBoolean();
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
public @Override void run() {
try {
SortedSet<ModuleDependency> deps = new TreeSet<ModuleDependency>(pxm.getDirectDependencies());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.swing.JDialog;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;
import org.netbeans.spi.project.ui.CustomizerProvider;
import org.netbeans.spi.project.ui.support.ProjectCustomizer;
import org.openide.ErrorManager;
Expand All @@ -43,6 +42,8 @@
import org.openide.util.lookup.Lookups;
import org.openide.util.lookup.ProxyLookup;

import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;

/**
* Convenient class to be used by {@link CustomizerProvider} implementations.
*
Expand Down Expand Up @@ -110,7 +111,7 @@ public void showCustomizer(String preselectedCategory, final String preselectedS
} else {
final String category = (preselectedCategory != null) ? preselectedCategory : lastSelectedCategory;
final AtomicReference<Lookup> context = new AtomicReference<Lookup>();
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
@Override public void run() {
context.set(new ProxyLookup(prepareData(), Lookups.fixed(new SubCategoryProvider(category, preselectedSubCategory))));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.modules.apisupport.project.api.BasicWizardPanel;
import static org.netbeans.modules.apisupport.project.ui.platform.Bundle.*;
import org.netbeans.modules.apisupport.project.universe.NbPlatform;
Expand Down Expand Up @@ -84,7 +84,7 @@ public static ActionListener showCustomizerAction() {
})
public static Object showCustomizer() {
final AtomicBoolean canceled = new AtomicBoolean();
ProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
BaseProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
@Override public void run() {
HarnessUpgrader.checkForUpgrade();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -199,7 +194,7 @@ static void deleteProject(final SuiteProject project, UserInputHandler handler)
final Map<NbModuleProject,List<FileObject>> 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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 0 additions & 8 deletions apisupport/maven.apisupport/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,6 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.templates</code-name-base>
<build-prerequisite/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -113,7 +112,7 @@ private void download(List<Artifact> arts, MavenEmbedder online, List<ArtifactRe
if (!toDownload.isEmpty()) {
int cnt = 0;
final AtomicBoolean canceled = new AtomicBoolean();
ProgressHandle h = ProgressHandleFactory.createHandle(Bundle.MavenPlatformJarProvider_downloading(), new Cancellable() {
ProgressHandle h = ProgressHandle.createHandle(Bundle.MavenPlatformJarProvider_downloading(), new Cancellable() {
@Override public boolean cancel() {
canceled.set(true);
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.SwingUtilities;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.api.project.Project;
import org.netbeans.modules.cordova.platforms.api.WebKitDebuggingSupport;
import org.netbeans.modules.web.browser.api.BrowserSupport;
Expand Down Expand Up @@ -137,7 +137,7 @@ public void setURL(final URL url) {
return;
}
try {
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
@Override
public void run() {
if (kind == Kind.IOS_DEVICE_DEFAULT) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package org.netbeans.modules.cordova.platforms.ios;

import java.util.concurrent.atomic.AtomicBoolean;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.api.progress.BaseProgressUtils;
import org.netbeans.api.project.Project;
import org.netbeans.modules.cordova.platforms.api.WebKitDebuggingSupport;
import org.netbeans.modules.web.browser.api.BrowserSupport;
Expand Down Expand Up @@ -54,7 +54,7 @@ public String[] getSupportedActions() {
@Override
public void invokeAction(final String command, final Lookup context) throws IllegalArgumentException {
try {
ProgressUtils.runOffEventDispatchThread(new Runnable() {
BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
@Override
public void run() {
WebKitDebuggingSupport.getDefault().stopDebugging(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.groovy.grailsproject.GrailsProject;
import org.netbeans.modules.groovy.grailsproject.ProgressSupport;
import org.openide.DialogDisplayer;
Expand All @@ -46,7 +45,7 @@ public boolean isEnabled() {
}

public void actionPerformed(ActionEvent e) {
final ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(ResolvePluginsAction.class, "LBL_Resolving_Project_Plugins_progress"));
final ProgressHandle handle = ProgressHandle.createHandle(NbBundle.getMessage(ResolvePluginsAction.class, "LBL_Resolving_Project_Plugins_progress"));

final Dialog dialog = DialogDisplayer.getDefault().createDialog(
ProgressSupport.createProgressDialog(NbBundle.getMessage(ResolvePluginsAction.class, "LBL_Resolving_Project_Plugins"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.netbeans.api.extexecution.input.InputProcessors;
import org.netbeans.api.extexecution.input.LineProcessor;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectUtils;
Expand Down Expand Up @@ -273,7 +272,7 @@ private boolean handlePlugins(final Collection<GrailsPlugin> 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);
Expand Down
8 changes: 0 additions & 8 deletions contrib/j2ee.jboss4/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.xml</code-name-base>
<build-prerequisite/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions enterprise/glassfish.common/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.db</code-name-base>
<build-prerequisite/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 0 additions & 8 deletions enterprise/javaee.wildfly/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.xml</code-name-base>
<build-prerequisite/>
Expand Down
8 changes: 0 additions & 8 deletions enterprise/maven.j2ee/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress.nb</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>1.40</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.templates</code-name-base>
<build-prerequisite/>
Expand Down
Loading
Loading