mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 17:26:01 +02:00
Code Issues Wiki Activity

Bug 265796

Browse source
This commit is contained in:
Ken Ryall 2009-02-25 20:06:32 +00:00
parent 626108adc3
commit eeb929745b
19 changed files with 133 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
View file

@ -16,10 +16,10 @@ Export-Package: org.eclipse.cdt.debug.core,
org.eclipse.cdt.debug.core.executables, org.eclipse.cdt.debug.core.executables,
org.eclipse.cdt.debug.core.model, org.eclipse.cdt.debug.core.model,
org.eclipse.cdt.debug.core.sourcelookup, org.eclipse.cdt.debug.core.sourcelookup,
org.eclipse.cdt.debug.internal.core, org.eclipse.cdt.debug.internal.core;x-internal:=true,
org.eclipse.cdt.debug.internal.core.breakpoints, org.eclipse.cdt.debug.internal.core.breakpoints;x-internal:=true,
org.eclipse.cdt.debug.internal.core.model;x-internal:=true, org.eclipse.cdt.debug.internal.core.model;x-internal:=true,
org.eclipse.cdt.debug.internal.core.sourcelookup org.eclipse.cdt.debug.internal.core.sourcelookup;x-internal:=true
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",

2
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBigIntegerValue.java
View file

@ -16,7 +16,7 @@ package org.eclipse.cdt.debug.core.cdi.model.type;
* *
* Represents the value of a variable. * Represents the value of a variable.
* *
* @since Nov 6.0 , 2008 * @since 6.0
*/ */
public interface ICDIBigIntegerValue extends ICDIIntegralValue { public interface ICDIBigIntegerValue extends ICDIIntegralValue {

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java
View file

@ -71,6 +71,7 @@ public class Executable extends PlatformObject {
return true; return true;
} }
@Override
public boolean equals(Object arg0) { public boolean equals(Object arg0) {
if (arg0 instanceof Executable) if (arg0 instanceof Executable)
{ {
@ -130,6 +131,10 @@ public class Executable extends PlatformObject {
return super.getAdapter(adapter); return super.getAdapter(adapter);
} }
/**
* @noreference This method is not intended to be referenced by clients.
* @since 6.0
*/
public TranslationUnit[] getSourceFiles(IProgressMonitor monitor) { public TranslationUnit[] getSourceFiles(IProgressMonitor monitor) {
if (!refreshSourceFiles) if (!refreshSourceFiles)
@ -224,6 +229,9 @@ public class Executable extends PlatformObject {
return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]) ; return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]) ;
} }
/**
* @since 6.0
*/
public void setRefreshSourceFiles(boolean refreshSourceFiles) { public void setRefreshSourceFiles(boolean refreshSourceFiles) {
this.refreshSourceFiles = refreshSourceFiles; this.refreshSourceFiles = refreshSourceFiles;
} }

6
debug/org.eclipse.cdt.debug.mi.core/.project
View file

@ -20,9 +20,15 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

4
debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.mi.core; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.debug.mi.core; singleton:=true
Bundle-Version: 5.1.0.qualifier Bundle-Version: 6.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.mi.core.MIPlugin Bundle-Activator: org.eclipse.cdt.debug.mi.core.MIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.variables org.eclipse.core.variables;bundle-version="3.2.200"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-RequiredExecutionEnvironment: J2SE-1.5

27
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java
View file

@ -18,6 +18,9 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointType; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint; import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint;
/**
* @since 6.0
*/
public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint {
public static final String CATCH = "org.eclipse.cdt.debug.gdb.catch"; public static final String CATCH = "org.eclipse.cdt.debug.gdb.catch";
@ -26,13 +29,37 @@ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint {
public static final String STOP_ON_FORK = "org.eclipse.cdt.debug.gdb.catch_fork"; public static final String STOP_ON_FORK = "org.eclipse.cdt.debug.gdb.catch_fork";
public static final String STOP_ON_VFORK = "org.eclipse.cdt.debug.gdb.catch_vfork"; public static final String STOP_ON_VFORK = "org.eclipse.cdt.debug.gdb.catch_vfork";
public static final String STOP_ON_EXEC = "org.eclipse.cdt.debug.gdb.catch_exec"; public static final String STOP_ON_EXEC = "org.eclipse.cdt.debug.gdb.catch_exec";
/**
* @since 6.0
*/
public static final String CATCH_EXIT = "org.eclipse.cdt.debug.gdb.catch_exit"; public static final String CATCH_EXIT = "org.eclipse.cdt.debug.gdb.catch_exit";
/**
* @since 6.0
*/
public static final String CATCH_START = "org.eclipse.cdt.debug.gdb.catch_start"; public static final String CATCH_START = "org.eclipse.cdt.debug.gdb.catch_start";
/**
* @since 6.0
*/
public static final String CATCH_STOP = "org.eclipse.cdt.debug.gdb.catch_stop"; public static final String CATCH_STOP = "org.eclipse.cdt.debug.gdb.catch_stop";
/**
* @since 6.0
*/
public static final String CATCH_THREAD_START = "org.eclipse.cdt.debug.gdb.catch_thread_start"; public static final String CATCH_THREAD_START = "org.eclipse.cdt.debug.gdb.catch_thread_start";
/**
* @since 6.0
*/
public static final String CATCH_THREAD_EXIT = "org.eclipse.cdt.debug.gdb.catch_thread_exit"; public static final String CATCH_THREAD_EXIT = "org.eclipse.cdt.debug.gdb.catch_thread_exit";
/**
* @since 6.0
*/
public static final String CATCH_THREAD_JOIN = "org.eclipse.cdt.debug.gdb.catch_thread_join"; public static final String CATCH_THREAD_JOIN = "org.eclipse.cdt.debug.gdb.catch_thread_join";
/**
* @since 6.0
*/
public static final String CATCH_LOAD = "org.eclipse.cdt.debug.gdb.catch_load"; public static final String CATCH_LOAD = "org.eclipse.cdt.debug.gdb.catch_load";
/**
* @since 6.0
*/
public static final String CATCH_UNLOAD = "org.eclipse.cdt.debug.gdb.catch_unload"; public static final String CATCH_UNLOAD = "org.eclipse.cdt.debug.gdb.catch_unload";
private String eventType; private String eventType;

3
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
View file

@ -722,6 +722,9 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteMoveInstructionPointer#moveInstructionPointer(org.eclipse.cdt.debug.core.cdi.ICDILocation) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteMoveInstructionPointer#moveInstructionPointer(org.eclipse.cdt.debug.core.cdi.ICDILocation)
*/ */
/**
* @since 6.0
*/
public void moveInstructionPointer(ICDILocation location) throws CDIException { public void moveInstructionPointer(ICDILocation location) throws CDIException {
// Most of this code was taken from our Resume() // Most of this code was taken from our Resume()
// method. The only differences are that we create a temporary // method. The only differences are that we create a temporary

4
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
View file

@ -74,6 +74,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru
currentFrames = null; currentFrames = null;
} }
@Override
public String toString() { public String toString() {
String str = Integer.toString(id); String str = Integer.toString(id);
if (name != null) { if (name != null) {
@ -555,6 +556,9 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteMoveInstructionPointer#moveInstructionPointer(org.eclipse.cdt.debug.core.cdi.ICDILocation) * @see org.eclipse.cdt.debug.core.cdi.model.ICDIExecuteMoveInstructionPointer#moveInstructionPointer(org.eclipse.cdt.debug.core.cdi.ICDILocation)
*/ */
/**
* @since 6.0
*/
public void moveInstructionPointer(ICDILocation location) throws CDIException { public void moveInstructionPointer(ICDILocation location) throws CDIException {
Target target = (Target)getTarget(); Target target = (Target)getTarget();
synchronized(target.getLock()) { synchronized(target.getLock()) {

2
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java
View file

@ -32,6 +32,7 @@ public class Value extends CObject implements ICDIValue {
* it is, then some decoding is needed on the value string we get from gdb, * it is, then some decoding is needed on the value string we get from gdb,
* since it will contain two things: the address of the variable being * since it will contain two things: the address of the variable being
* referenced and the value. * referenced and the value.
* @since 6.0
*/ */
protected boolean fIsReference; protected boolean fIsReference;
@ -145,6 +146,7 @@ public class Value extends CObject implements ICDIValue {
* introducing it that way at this point in time would cause a lot of churn * introducing it that way at this point in time would cause a lot of churn
* in the codebase, since this class is not directly instantiated, and it * in the codebase, since this class is not directly instantiated, and it
* has many subclasses. * has many subclasses.
* @since 6.0
*/ */
public void setIsReference(boolean isReference) { public void setIsReference(boolean isReference) {
fIsReference = isReference; fIsReference = isReference;

1
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java
View file

@ -43,6 +43,7 @@ public class ReferenceValue extends DerivedValue implements ICDIReferenceValue {
/** /**
* Construct a value object for the referred variable * Construct a value object for the referred variable
* @param v * @param v
* @since 6.0
*/ */
public ReferenceValue(Variable v) { public ReferenceValue(Variable v) {
super(v); super(v);

6
debug/org.eclipse.cdt.debug.mi.ui/.project
View file

@ -20,9 +20,15 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

16
debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
View file

@ -2,20 +2,20 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.mi.ui; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.debug.mi.ui; singleton:=true
Bundle-Version: 5.1.0.qualifier Bundle-Version: 6.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin Bundle-Activator: org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: org.eclipse.cdt.debug.mi.internal.ui, Export-Package: org.eclipse.cdt.debug.mi.internal.ui;x-internal:=true,
org.eclipse.cdt.debug.mi.internal.ui.actions, org.eclipse.cdt.debug.mi.internal.ui.actions;x-internal:=true,
org.eclipse.cdt.debug.mi.internal.ui.dialogfields, org.eclipse.cdt.debug.mi.internal.ui.dialogfields;x-internal:=true,
org.eclipse.cdt.debug.mi.internal.ui.preferences, org.eclipse.cdt.debug.mi.internal.ui.preferences;x-internal:=true,
org.eclipse.cdt.debug.mi.internal.ui.propertypages, org.eclipse.cdt.debug.mi.internal.ui.propertypages;x-internal:=true,
org.eclipse.cdt.debug.mi.ui org.eclipse.cdt.debug.mi.ui
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.debug.mi.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.debug.mi.core;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.debug.ui;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.debug.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)", org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",

6
debug/org.eclipse.cdt.debug.ui/.project
View file

@ -20,9 +20,15 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

26
debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
View file

@ -2,23 +2,23 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
Bundle-Version: 5.0.100.qualifier Bundle-Version: 6.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: Export-Package:
org.eclipse.cdt.debug.internal.ui, org.eclipse.cdt.debug.internal.ui;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.actions, org.eclipse.cdt.debug.internal.ui.actions;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.dialogfields, org.eclipse.cdt.debug.internal.ui.dialogfields;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.editors, org.eclipse.cdt.debug.internal.ui.editors;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.preferences, org.eclipse.cdt.debug.internal.ui.preferences;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.propertypages, org.eclipse.cdt.debug.internal.ui.propertypages;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.sourcelookup, org.eclipse.cdt.debug.internal.ui.sourcelookup;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.views, org.eclipse.cdt.debug.internal.ui.views;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.views.disassembly, org.eclipse.cdt.debug.internal.ui.views.disassembly;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.views.executables, org.eclipse.cdt.debug.internal.ui.views.executables;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.views.modules, org.eclipse.cdt.debug.internal.ui.views.modules;x-internal:=true,
org.eclipse.cdt.debug.internal.ui.views.signals, org.eclipse.cdt.debug.internal.ui.views.signals;x-internal:=true,
org.eclipse.cdt.debug.ui, org.eclipse.cdt.debug.ui,
org.eclipse.cdt.debug.ui.breakpointactions, org.eclipse.cdt.debug.ui.breakpointactions,
org.eclipse.cdt.debug.ui.breakpoints, org.eclipse.cdt.debug.ui.breakpoints,

1
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java
View file

@ -34,6 +34,7 @@ public interface ICDebugUIConstants {
/** /**
* Signals view identifier (value <code>"org.eclipse.cdt.debug.ui.SignalsView"</code>). * Signals view identifier (value <code>"org.eclipse.cdt.debug.ui.SignalsView"</code>).
* @since 6.0
*/ */
public static final String ID_SIGNALS_VIEW = PREFIX + "SignalsView"; //$NON-NLS-1$ public static final String ID_SIGNALS_VIEW = PREFIX + "SignalsView"; //$NON-NLS-1$

6
launch/org.eclipse.cdt.launch/.project
View file

@ -20,9 +20,15 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

8
launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
View file

@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
Bundle-Version: 5.0.100.qualifier Bundle-Version: 6.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: org.eclipse.cdt.launch, Export-Package: org.eclipse.cdt.launch,
org.eclipse.cdt.launch.internal, org.eclipse.cdt.launch.internal;x-internal:=true,
org.eclipse.cdt.launch.internal.ui, org.eclipse.cdt.launch.internal.ui;x-internal:=true,
org.eclipse.cdt.launch.ui org.eclipse.cdt.launch.ui
Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)", org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
org.eclipse.cdt.debug.ui;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.debug.ui;bundle-version="[6.0.0,7.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)" org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy

10
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
View file

@ -98,6 +98,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @exception CoreException * @exception CoreException
* if unable to retrieve the attribute * if unable to retrieve the attribute
*/ */
@Deprecated
public File getWorkingDir(ILaunchConfiguration configuration) throws CoreException { public File getWorkingDir(ILaunchConfiguration configuration) throws CoreException {
return getWorkingDirectory(configuration); return getWorkingDirectory(configuration);
} }
@ -209,6 +210,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @throws CoreException * @throws CoreException
* @deprecated * @deprecated
*/ */
@Deprecated
protected void setSourceLocator(ILaunch launch, ILaunchConfiguration config) throws CoreException { protected void setSourceLocator(ILaunch launch, ILaunchConfiguration config) throws CoreException {
setDefaultSourceLocator(launch, config); setDefaultSourceLocator(launch, config);
} }
@ -310,6 +312,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
/** /**
* @deprecated * @deprecated
*/ */
@Deprecated
protected String renderDebuggerProcessLabel() { protected String renderDebuggerProcessLabel() {
String format = "{0} ({1})"; //$NON-NLS-1$ String format = "{0} ({1})"; //$NON-NLS-1$
String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis())); String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
@ -324,6 +327,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @throws CoreException * @throws CoreException
* @deprecated Use <code>verifyProgramFile</code> instead. * @deprecated Use <code>verifyProgramFile</code> instead.
*/ */
@Deprecated
protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException { protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException {
ICProject cproject = verifyCProject(config); ICProject cproject = verifyCProject(config);
String fileName = getProgramName(config); String fileName = getProgramName(config);
@ -535,6 +539,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @throws CoreException * @throws CoreException
* if an exception occurrs while building * if an exception occurrs while building
*/ */
@Override
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
//This matches the old code, but I don't know that it is the right behaviour. //This matches the old code, but I don't know that it is the right behaviour.
//We should be building the local project as well, not just the ordered projects //We should be building the local project as well, not just the ordered projects
@ -605,6 +610,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @throws CoreException * @throws CoreException
* if an exception occurs while checking for compile errors. * if an exception occurs while checking for compile errors.
*/ */
@Override
public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
boolean continueLaunch = true; boolean continueLaunch = true;
if(orderedProjects == null) { if(orderedProjects == null) {
@ -681,6 +687,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @param proj * @param proj
* The project to search * The project to search
* @return true if compile errors exist, otherwise false * @return true if compile errors exist, otherwise false
* @since 6.0
*/ */
protected boolean existsErrors(IProject proj) throws CoreException { protected boolean existsErrors(IProject proj) throws CoreException {
IMarker[] markers = proj.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); IMarker[] markers = proj.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
@ -702,6 +709,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration,
* java.lang.String, org.eclipse.core.runtime.IProgressMonitor) * java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/ */
@Override
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
if(monitor == null) { if(monitor == null) {
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
@ -820,6 +828,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* name=value * name=value
* @deprecated * @deprecated
*/ */
@Deprecated
protected String[] getEnvironmentArray(ILaunchConfiguration config) { protected String[] getEnvironmentArray(ILaunchConfiguration config) {
Map env = null; Map env = null;
try { try {
@ -844,6 +853,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
* does not include the default environment of the target. * does not include the default environment of the target.
* @deprecated * @deprecated
*/ */
@Deprecated
protected Properties getEnvironmentProperty(ILaunchConfiguration config) { protected Properties getEnvironmentProperty(ILaunchConfiguration config) {
Properties prop = new Properties(); Properties prop = new Properties();
Map env = null; Map env = null;

22
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
View file

@ -90,6 +90,9 @@ public class CMainTab extends CLaunchConfigurationTab {
protected Label fProgLabel; protected Label fProgLabel;
protected Text fProgText; protected Text fProgText;
protected Button fSearchButton; protected Button fSearchButton;
/**
* @since 6.0
*/
protected Combo fBuildConfigCombo; protected Combo fBuildConfigCombo;
private final boolean fWantsTerminalOption; private final boolean fWantsTerminalOption;
@ -142,6 +145,9 @@ public class CMainTab extends CLaunchConfigurationTab {
LaunchUIPlugin.setDialogShell(parent.getShell()); LaunchUIPlugin.setDialogShell(parent.getShell());
} }
/**
* @since 6.0
*/
protected void createProjectGroup(Composite parent, int colSpan) { protected void createProjectGroup(Composite parent, int colSpan) {
Composite projComp = new Composite(parent, SWT.NONE); Composite projComp = new Composite(parent, SWT.NONE);
GridLayout projLayout = new GridLayout(); GridLayout projLayout = new GridLayout();
@ -173,6 +179,7 @@ public class CMainTab extends CLaunchConfigurationTab {
fProjButton = createPushButton(projComp, LaunchMessages.getString("Launch.common.Browse_1"), null); //$NON-NLS-1$ fProjButton = createPushButton(projComp, LaunchMessages.getString("Launch.common.Browse_1"), null); //$NON-NLS-1$
fProjButton.addSelectionListener(new SelectionAdapter() { fProjButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleProjectButtonSelected(); handleProjectButtonSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -180,6 +187,9 @@ public class CMainTab extends CLaunchConfigurationTab {
}); });
} }
/**
* @since 6.0
*/
protected void updateBuildConfigCombo(String selectedConfigID) { protected void updateBuildConfigCombo(String selectedConfigID) {
fBuildConfigCombo.removeAll(); fBuildConfigCombo.removeAll();
fBuildConfigCombo.add(LaunchMessages.getString("CMainTab.Use_Active")); //$NON-NLS-1$ fBuildConfigCombo.add(LaunchMessages.getString("CMainTab.Use_Active")); //$NON-NLS-1$
@ -208,6 +218,9 @@ public class CMainTab extends CLaunchConfigurationTab {
} }
/**
* @since 6.0
*/
protected void createBuildConfigCombo(Composite parent, int colspan) { protected void createBuildConfigCombo(Composite parent, int colspan) {
Composite comboComp = new Composite(parent, SWT.NONE); Composite comboComp = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false); GridLayout layout = new GridLayout(2, false);
@ -256,6 +269,7 @@ public class CMainTab extends CLaunchConfigurationTab {
fSearchButton = createPushButton(mainComp, LaunchMessages.getString("CMainTab.Search..."), null); //$NON-NLS-1$ fSearchButton = createPushButton(mainComp, LaunchMessages.getString("CMainTab.Search..."), null); //$NON-NLS-1$
fSearchButton.addSelectionListener(new SelectionAdapter() { fSearchButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleSearchButtonSelected(); handleSearchButtonSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -265,6 +279,7 @@ public class CMainTab extends CLaunchConfigurationTab {
Button fBrowseForBinaryButton; Button fBrowseForBinaryButton;
fBrowseForBinaryButton = createPushButton(mainComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$ fBrowseForBinaryButton = createPushButton(mainComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$
fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() { fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleBinaryBrowseButtonSelected(); handleBinaryBrowseButtonSelected();
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
@ -290,6 +305,7 @@ public class CMainTab extends CLaunchConfigurationTab {
fTerminalButton = createCheckButton(mainComp, LaunchMessages.getString("CMainTab.UseTerminal")); //$NON-NLS-1$ fTerminalButton = createCheckButton(mainComp, LaunchMessages.getString("CMainTab.UseTerminal")); //$NON-NLS-1$
fTerminalButton.addSelectionListener(new SelectionAdapter() { fTerminalButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
updateLaunchConfigurationDialog(); updateLaunchConfigurationDialog();
} }
@ -376,6 +392,7 @@ public class CMainTab extends CLaunchConfigurationTab {
ILabelProvider programLabelProvider = new CElementLabelProvider() { ILabelProvider programLabelProvider = new CElementLabelProvider() {
@Override
public String getText(Object element) { public String getText(Object element) {
if (element instanceof IBinary) { if (element instanceof IBinary) {
IBinary bin = (IBinary)element; IBinary bin = (IBinary)element;
@ -386,6 +403,7 @@ public class CMainTab extends CLaunchConfigurationTab {
return super.getText(element); return super.getText(element);
} }
@Override
public Image getImage(Object element) { public Image getImage(Object element) {
if (! (element instanceof ICElement)) { if (! (element instanceof ICElement)) {
return super.getImage(element); return super.getImage(element);
@ -405,6 +423,7 @@ public class CMainTab extends CLaunchConfigurationTab {
ILabelProvider qualifierLabelProvider = new CElementLabelProvider() { ILabelProvider qualifierLabelProvider = new CElementLabelProvider() {
@Override
public String getText(Object element) { public String getText(Object element) {
if (element instanceof IBinary) { if (element instanceof IBinary) {
IBinary bin = (IBinary)element; IBinary bin = (IBinary)element;
@ -568,6 +587,7 @@ public class CMainTab extends CLaunchConfigurationTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration) * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
*/ */
@Override
public boolean isValid(ILaunchConfiguration config) { public boolean isValid(ILaunchConfiguration config) {
setErrorMessage(null); setErrorMessage(null);
@ -774,6 +794,7 @@ public class CMainTab extends CLaunchConfigurationTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
*/ */
@Override
public Image getImage() { public Image getImage() {
return LaunchImages.get(LaunchImages.IMG_VIEW_MAIN_TAB); return LaunchImages.get(LaunchImages.IMG_VIEW_MAIN_TAB);
} }
@ -783,6 +804,7 @@ public class CMainTab extends CLaunchConfigurationTab {
* *
* @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
*/ */
@Override
protected void updateLaunchConfigurationDialog() { protected void updateLaunchConfigurationDialog() {
super.updateLaunchConfigurationDialog(); super.updateLaunchConfigurationDialog();
} }