mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Bug 265498: LaunchUIPlugin handleDebugEvents(...) launches multiple Project refreshes on launch terminate.
This commit is contained in:
Mikhail Khodjaiants
parent
c98bf28da7
commit
196f907dc8
2 changed files with 93 additions and 57 deletions
|
|
@ -16,8 +16,6 @@ package org.eclipse.cdt.launch;
|
|||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import com.ibm.icu.text.DateFormat;
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
|
|
@ -28,6 +26,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.eclipse.cdt.core.CCorePlugin;
|
||||
import org.eclipse.cdt.core.IBinaryParser;
|
||||
|
|
@ -62,19 +61,73 @@ import org.eclipse.core.runtime.NullProgressMonitor;
|
|||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.core.runtime.SubProgressMonitor;
|
||||
import org.eclipse.core.runtime.jobs.Job;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.ILaunch;
|
||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
||||
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
|
||||
import org.eclipse.debug.core.ILaunchManager;
|
||||
import org.eclipse.debug.core.IStatusHandler;
|
||||
import org.eclipse.debug.core.Launch;
|
||||
import org.eclipse.debug.core.model.IPersistableSourceLocator;
|
||||
import org.eclipse.debug.core.model.IProcess;
|
||||
import org.eclipse.debug.core.model.ISourceLocator;
|
||||
import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
|
||||
import org.eclipse.debug.ui.RefreshTab;
|
||||
|
||||
import com.ibm.icu.text.DateFormat;
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegate {
|
||||
|
||||
/**
|
||||
public class CLaunch extends Launch {
|
||||
|
||||
private AtomicBoolean fRefreshDone;
|
||||
|
||||
public CLaunch(ILaunchConfiguration launchConfiguration, String mode, ISourceLocator locator) {
|
||||
super(launchConfiguration, mode, locator);
|
||||
fRefreshDone = new AtomicBoolean(false);
|
||||
}
|
||||
|
||||
public void refresh() {
|
||||
if (fRefreshDone.compareAndSet(false, true)) {
|
||||
final ILaunchConfiguration config = getLaunchConfiguration();
|
||||
try {
|
||||
if (RefreshTab.getRefreshScope(config) != null) {
|
||||
Job refreshJob = new Job("Refresh"){
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
|
||||
*/
|
||||
@Override
|
||||
protected IStatus run(IProgressMonitor monitor) {
|
||||
try {
|
||||
RefreshTab.refreshResources(config, monitor);
|
||||
} catch (CoreException e) {
|
||||
return new Status(IStatus.ERROR, LaunchUIPlugin.PLUGIN_ID, 1, e.getLocalizedMessage(), e);
|
||||
}
|
||||
return Status.OK_STATUS;
|
||||
}};
|
||||
refreshJob.setSystem(true);
|
||||
refreshJob.schedule();
|
||||
}
|
||||
}
|
||||
catch(CoreException e) {
|
||||
LaunchUIPlugin.log( e.getStatus() );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
|
||||
*/
|
||||
@Override
|
||||
public ILaunch getLaunch(ILaunchConfiguration configuration, String mode) throws CoreException {
|
||||
return new CLaunch(configuration, mode, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* The project containing the programs file being launched
|
||||
*/
|
||||
private IProject project;
|
||||
|
|
|
|||
|
|
@ -11,17 +11,12 @@
|
|||
package org.eclipse.cdt.launch.internal.ui;
|
||||
|
||||
import org.eclipse.cdt.debug.core.ICDebugConstants;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.cdt.launch.AbstractCLaunchDelegate.CLaunch;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.core.runtime.jobs.Job;
|
||||
import org.eclipse.debug.core.DebugEvent;
|
||||
import org.eclipse.debug.core.DebugPlugin;
|
||||
import org.eclipse.debug.core.IDebugEventSetListener;
|
||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
||||
import org.eclipse.debug.core.model.IProcess;
|
||||
import org.eclipse.debug.ui.RefreshTab;
|
||||
import org.eclipse.debug.core.ILaunch;
|
||||
import org.eclipse.debug.core.ILaunchesListener2;
|
||||
import org.eclipse.jface.dialogs.ErrorDialog;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.IWorkbenchPage;
|
||||
|
|
@ -29,7 +24,7 @@ import org.eclipse.ui.IWorkbenchWindow;
|
|||
import org.eclipse.ui.plugin.AbstractUIPlugin;
|
||||
import org.osgi.framework.BundleContext;
|
||||
|
||||
public class LaunchUIPlugin extends AbstractUIPlugin implements IDebugEventSetListener {
|
||||
public class LaunchUIPlugin extends AbstractUIPlugin implements ILaunchesListener2 {
|
||||
|
||||
public static final String PLUGIN_ID = "org.eclipse.cdt.launch"; //$NON-NLS-1$
|
||||
|
||||
|
|
@ -181,10 +176,11 @@ public class LaunchUIPlugin extends AbstractUIPlugin implements IDebugEventSetLi
|
|||
*
|
||||
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
|
||||
*/
|
||||
public void start(BundleContext context) throws Exception {
|
||||
@Override
|
||||
public void start(BundleContext context) throws Exception {
|
||||
super.start(context);
|
||||
LaunchUIPlugin.getDefault().getPluginPreferences().getString( ICDebugConstants.PREF_FILTERED_DEBUGGERS );
|
||||
DebugPlugin.getDefault().addDebugEventListener(this);
|
||||
DebugPlugin.getDefault().getLaunchManager().addLaunchListener( this );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -192,51 +188,38 @@ public class LaunchUIPlugin extends AbstractUIPlugin implements IDebugEventSetLi
|
|||
*
|
||||
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
|
||||
*/
|
||||
public void stop(BundleContext context) throws Exception {
|
||||
DebugPlugin.getDefault().removeDebugEventListener(this);
|
||||
@Override
|
||||
public void stop(BundleContext context) throws Exception {
|
||||
DebugPlugin.getDefault().getLaunchManager().removeLaunchListener( this );
|
||||
super.stop(context);
|
||||
}
|
||||
|
||||
/**
|
||||
* Notifies this listener of the given debug events. All of the events in
|
||||
* the given event collection occurred at the same location the program be
|
||||
* run or debugged.
|
||||
*
|
||||
* @param events
|
||||
* the debug events
|
||||
*/
|
||||
public void handleDebugEvents(DebugEvent[] events) {
|
||||
for (int i = 0; i < events.length; i++) {
|
||||
if (events[i].getKind() == DebugEvent.TERMINATE) {
|
||||
Object o = events[i].getSource();
|
||||
if (o instanceof IProcess) {
|
||||
IProcess process = (IProcess)o;
|
||||
final ILaunchConfiguration config = process.getLaunch().getLaunchConfiguration();
|
||||
try {
|
||||
if (RefreshTab.getRefreshScope(config) != null) {
|
||||
Job refreshJob = new Job("Refresh"){
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
|
||||
*/
|
||||
public void launchesAdded( ILaunch[] launches ) {
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
|
||||
*/
|
||||
@Override
|
||||
protected IStatus run(IProgressMonitor monitor) {
|
||||
try {
|
||||
RefreshTab.refreshResources(config, monitor);
|
||||
} catch (CoreException e) {
|
||||
return new Status(IStatus.ERROR, PLUGIN_ID, 1, e.getLocalizedMessage(), e);
|
||||
}
|
||||
return Status.OK_STATUS;
|
||||
}};
|
||||
refreshJob.setSystem(true);
|
||||
refreshJob.schedule();
|
||||
}
|
||||
}
|
||||
catch(CoreException e) {
|
||||
LaunchUIPlugin.log( e.getStatus() );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
|
||||
*/
|
||||
public void launchesChanged( ILaunch[] launches ) {
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
|
||||
*/
|
||||
public void launchesRemoved( ILaunch[] launches ) {
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[])
|
||||
*/
|
||||
public void launchesTerminated( ILaunch[] launches ) {
|
||||
for ( ILaunch l : launches ) {
|
||||
if ( l instanceof CLaunch ) {
|
||||
((CLaunch)l).refresh();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue