mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 09:45:39 +02:00
Code Issues Wiki Activity

Cleanup.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2003-09-16 21:10:35 +00:00
parent 0cca8134a6
commit 6b328b777c
2 changed files with 7 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,9 +1,13 @@
2003-11-10 Mikhail Khodjaiants 2003-10-16 Mikhail Khodjaiants
Cleanup.
* CUISourceLocator.java
2003-10-11 Mikhail Khodjaiants
Reset the selection of variable after casting. Reset the selection of variable after casting.
* CastToArrayActionDelegate.java * CastToArrayActionDelegate.java
* CastToTypeActionDelegate.java * CastToTypeActionDelegate.java
2003-11-10 Mikhail Khodjaiants 2003-10-11 Mikhail Khodjaiants
Moving the shared library search paths block to mi UI. Moving the shared library search paths block to mi UI.
* SolibSearchPathBlock.java: moved to mi UI. * SolibSearchPathBlock.java: moved to mi UI.

46
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/CUISourceLocator.java
View file

@ -12,23 +12,16 @@ import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLocator;
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceManager; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceManager;
import org.eclipse.cdt.debug.internal.ui.editors.FileNotFoundElement; import org.eclipse.cdt.debug.internal.ui.editors.FileNotFoundElement;
import org.eclipse.cdt.debug.internal.ui.editors.NoSymbolOrSourceElement; import org.eclipse.cdt.debug.internal.ui.editors.NoSymbolOrSourceElement;
import org.eclipse.cdt.debug.internal.ui.wizards.AddDirectorySourceLocationWizard;
import org.eclipse.cdt.debug.internal.ui.wizards.AddSourceLocationWizard;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IPersistableSourceLocator; import org.eclipse.debug.core.model.IPersistableSourceLocator;
import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
/** /**
* *
@ -49,15 +42,6 @@ public class CUISourceLocator implements IAdaptable
*/ */
private CSourceManager fSourceLocator; private CSourceManager fSourceLocator;
/**
* Whether the user should be prompted for source.
* Initially true, until the user checks the 'do not
* ask again' box.
*/
protected boolean fAllowedToAsk;
protected boolean fNewLocationAttached;
/** /**
* Constructor for CUISourceLocator. * Constructor for CUISourceLocator.
*/ */
@ -65,14 +49,12 @@ public class CUISourceLocator implements IAdaptable
{ {
fProject = project; fProject = project;
fSourceLocator = new CSourceManager( new CSourceLocator( project ) ); fSourceLocator = new CSourceManager( new CSourceLocator( project ) );
fAllowedToAsk = true;
fNewLocationAttached = false;
} }
public Object getSourceElement( IStackFrame stackFrame ) public Object getSourceElement( IStackFrame stackFrame )
{ {
Object res = fSourceLocator.getSourceElement( stackFrame ); Object res = fSourceLocator.getSourceElement( stackFrame );
if ( res == null && fAllowedToAsk ) if ( res == null )
{ {
IStackFrameInfo frameInfo = (IStackFrameInfo)stackFrame.getAdapter( IStackFrameInfo.class ); IStackFrameInfo frameInfo = (IStackFrameInfo)stackFrame.getAdapter( IStackFrameInfo.class );
if ( frameInfo != null && frameInfo.getFile() != null && frameInfo.getFile().length() > 0 ) if ( frameInfo != null && frameInfo.getFile() != null && frameInfo.getFile().length() > 0 )
@ -87,32 +69,6 @@ public class CUISourceLocator implements IAdaptable
return res; return res;
} }
protected void attachSourceLocation( ILaunch launch, String fileName )
{
IPath path = new Path( fileName );
INewSourceLocationWizard wizard = null;
if ( path.isAbsolute() )
{
path = path.removeLastSegments( 1 );
wizard = new AddDirectorySourceLocationWizard( path );
}
else
{
wizard = new AddSourceLocationWizard( fSourceLocator.getSourceLocations() );
}
WizardDialog dialog = new WizardDialog( CDebugUIPlugin.getActiveWorkbenchShell(), wizard );
if ( dialog.open() == Window.OK )
{
fSourceLocator.addSourceLocation( wizard.getSourceLocation() );
if ( launch.getSourceLocator() instanceof IPersistableSourceLocator )
{
ILaunchConfiguration configuration = launch.getLaunchConfiguration();
saveChanges( configuration, (IPersistableSourceLocator)launch.getSourceLocator() );
}
fNewLocationAttached = true;
}
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/ */