mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 19:25:38 +02:00
Code Issues Wiki Activity

Bug 137138: Common source containers get disposed.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2006-05-26 21:14:19 +00:00
parent ebd2942d59
commit f414177e35
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,3 +1,8 @@
2006-05-26 Mikhail Khodjaiants
Bug 137138: Common source containers get disposed.
* CSourceLookupParticipant.java
* CSourcePathComputerDelegate.java
2006-05-26 Mikhail Khodjaiants 2006-05-26 Mikhail Khodjaiants
Bug 122010: Registers View is displayed even if supportsRegisters and Bug 122010: Registers View is displayed even if supportsRegisters and
supportsRegisterModification are disabled. supportsRegisterModification are disabled.

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java
View file

@ -28,7 +28,7 @@ import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
*/ */
public class CSourceLookupParticipant extends AbstractSourceLookupParticipant { public class CSourceLookupParticipant extends AbstractSourceLookupParticipant {
static private class NoSourceElement { static class NoSourceElement {
} }
private static final NoSourceElement gfNoSource = new NoSourceElement(); private static final NoSourceElement gfNoSource = new NoSourceElement();

9
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourcePathComputerDelegate.java
View file

@ -11,9 +11,9 @@
package org.eclipse.cdt.debug.internal.core.sourcelookup; package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.sourcelookup.MappingSourceContainer;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -41,7 +41,12 @@ public class CSourcePathComputerDelegate implements ISourcePathComputerDelegate
public ISourceContainer[] computeSourceContainers( ILaunchConfiguration configuration, IProgressMonitor monitor ) throws CoreException { public ISourceContainer[] computeSourceContainers( ILaunchConfiguration configuration, IProgressMonitor monitor ) throws CoreException {
ISourceContainer[] common = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().getSourceContainers(); ISourceContainer[] common = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().getSourceContainers();
ArrayList containers = new ArrayList( common.length + 1 ); ArrayList containers = new ArrayList( common.length + 1 );
containers.addAll( Arrays.asList( common ) ); for ( int i = 0; i < common.length; ++i ) {
ISourceContainer sc = common[i];
if ( sc.getType().getId().equals( MappingSourceContainer.TYPE_ID ) )
sc = ((MappingSourceContainer)sc).copy();
containers.add( sc );
}
String projectName = configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null ); String projectName = configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null );
if ( projectName != null ) { if ( projectName != null ) {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName ); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName );