diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index 7912d504690..14f31a60bc8 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -16,10 +16,10 @@ Export-Package: org.eclipse.cdt.debug.core, org.eclipse.cdt.debug.core.executables, org.eclipse.cdt.debug.core.model, org.eclipse.cdt.debug.core.sourcelookup, - org.eclipse.cdt.debug.internal.core, - org.eclipse.cdt.debug.internal.core.breakpoints, + org.eclipse.cdt.debug.internal.core;x-internal:=true, + 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.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)", org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBigIntegerValue.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBigIntegerValue.java index 7f0680a2f50..071aca58709 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBigIntegerValue.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/type/ICDIBigIntegerValue.java @@ -16,7 +16,7 @@ package org.eclipse.cdt.debug.core.cdi.model.type; * * Represents the value of a variable. * - * @since Nov 6.0 , 2008 + * @since 6.0 */ public interface ICDIBigIntegerValue extends ICDIIntegralValue { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java index f1b3ae55aeb..1079de57fd9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java @@ -71,6 +71,7 @@ public class Executable extends PlatformObject { return true; } + @Override public boolean equals(Object arg0) { if (arg0 instanceof Executable) { @@ -130,6 +131,10 @@ public class Executable extends PlatformObject { return super.getAdapter(adapter); } + /** + * @noreference This method is not intended to be referenced by clients. + * @since 6.0 + */ public TranslationUnit[] getSourceFiles(IProgressMonitor monitor) { if (!refreshSourceFiles) @@ -224,6 +229,9 @@ public class Executable extends PlatformObject { return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]) ; } + /** + * @since 6.0 + */ public void setRefreshSourceFiles(boolean refreshSourceFiles) { this.refreshSourceFiles = refreshSourceFiles; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/.project b/debug/org.eclipse.cdt.debug.mi.core/.project index 9039e6a47ea..ccce5584ad9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/.project +++ b/debug/org.eclipse.cdt.debug.mi.core/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF index 8d01592eb87..115a8289cc0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName 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-Vendor: %providerName 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.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.variables + org.eclipse.core.variables;bundle-version="3.2.200" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java index 3eeb0b059ba..03d4c5c21d3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java @@ -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.mi.core.output.MIBreakpoint; +/** + * @since 6.0 + */ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { 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_VFORK = "org.eclipse.cdt.debug.gdb.catch_vfork"; 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"; + /** + * @since 6.0 + */ 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"; + /** + * @since 6.0 + */ 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"; + /** + * @since 6.0 + */ 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"; + /** + * @since 6.0 + */ public static final String CATCH_UNLOAD = "org.eclipse.cdt.debug.gdb.catch_unload"; private String eventType; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java index fd32a84e899..578b0da8051 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java @@ -722,6 +722,9 @@ public class Target extends SessionObject implements ICDITarget, ICDIBreakpointM /* (non-Javadoc) * @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 { // Most of this code was taken from our Resume() // method. The only differences are that we create a temporary diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java index 61edc650270..9092ccac55e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java @@ -74,6 +74,7 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru currentFrames = null; } + @Override public String toString() { String str = Integer.toString(id); if (name != null) { @@ -555,6 +556,9 @@ public class Thread extends CObject implements ICDIThread, ICDIExecuteMoveInstru /* (non-Javadoc) * @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 { Target target = (Target)getTarget(); synchronized(target.getLock()) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java index 34b29779a14..678da45b97b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java @@ -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, * since it will contain two things: the address of the variable being * referenced and the value. + * @since 6.0 */ 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 * in the codebase, since this class is not directly instantiated, and it * has many subclasses. + * @since 6.0 */ public void setIsReference(boolean isReference) { fIsReference = isReference; diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java index 4d6657d7d1c..c0ddd920234 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/type/ReferenceValue.java @@ -43,6 +43,7 @@ public class ReferenceValue extends DerivedValue implements ICDIReferenceValue { /** * Construct a value object for the referred variable * @param v + * @since 6.0 */ public ReferenceValue(Variable v) { super(v); diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.project b/debug/org.eclipse.cdt.debug.mi.ui/.project index d50943d5462..d5076a230e1 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/.project +++ b/debug/org.eclipse.cdt.debug.mi.ui/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF index 1524ac70708..8807e7a2b9a 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName 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-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.cdt.debug.mi.internal.ui, - org.eclipse.cdt.debug.mi.internal.ui.actions, - org.eclipse.cdt.debug.mi.internal.ui.dialogfields, - org.eclipse.cdt.debug.mi.internal.ui.preferences, - org.eclipse.cdt.debug.mi.internal.ui.propertypages, +Export-Package: org.eclipse.cdt.debug.mi.internal.ui;x-internal:=true, + org.eclipse.cdt.debug.mi.internal.ui.actions;x-internal:=true, + org.eclipse.cdt.debug.mi.internal.ui.dialogfields;x-internal:=true, + org.eclipse.cdt.debug.mi.internal.ui.preferences;x-internal:=true, + org.eclipse.cdt.debug.mi.internal.ui.propertypages;x-internal:=true, org.eclipse.cdt.debug.mi.ui 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.cdt.debug.mi.core;bundle-version="[5.0.0,6.0.0)", - org.eclipse.cdt.debug.ui;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="[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.ui;bundle-version="[5.0.0,6.0.0)", diff --git a/debug/org.eclipse.cdt.debug.ui/.project b/debug/org.eclipse.cdt.debug.ui/.project index 2f8de369392..2e36bfba6b8 100644 --- a/debug/org.eclipse.cdt.debug.ui/.project +++ b/debug/org.eclipse.cdt.debug.ui/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index b23ae34ab8a..99469be9415 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName 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-Vendor: %providerName Bundle-Localization: plugin Export-Package: - org.eclipse.cdt.debug.internal.ui, - org.eclipse.cdt.debug.internal.ui.actions, - org.eclipse.cdt.debug.internal.ui.dialogfields, - org.eclipse.cdt.debug.internal.ui.editors, - org.eclipse.cdt.debug.internal.ui.preferences, - org.eclipse.cdt.debug.internal.ui.propertypages, - org.eclipse.cdt.debug.internal.ui.sourcelookup, - org.eclipse.cdt.debug.internal.ui.views, - org.eclipse.cdt.debug.internal.ui.views.disassembly, - org.eclipse.cdt.debug.internal.ui.views.executables, - org.eclipse.cdt.debug.internal.ui.views.modules, - org.eclipse.cdt.debug.internal.ui.views.signals, + org.eclipse.cdt.debug.internal.ui;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.actions;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.dialogfields;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.editors;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.preferences;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.propertypages;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.sourcelookup;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.views;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.views.disassembly;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.views.executables;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.views.modules;x-internal:=true, + org.eclipse.cdt.debug.internal.ui.views.signals;x-internal:=true, org.eclipse.cdt.debug.ui, org.eclipse.cdt.debug.ui.breakpointactions, org.eclipse.cdt.debug.ui.breakpoints, diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java index 79a12c75e3d..f403b3d17c4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/ICDebugUIConstants.java @@ -34,6 +34,7 @@ public interface ICDebugUIConstants { /** * Signals view identifier (value "org.eclipse.cdt.debug.ui.SignalsView"). + * @since 6.0 */ public static final String ID_SIGNALS_VIEW = PREFIX + "SignalsView"; //$NON-NLS-1$ diff --git a/launch/org.eclipse.cdt.launch/.project b/launch/org.eclipse.cdt.launch/.project index b39fb88039a..4c2c56abaa3 100644 --- a/launch/org.eclipse.cdt.launch/.project +++ b/launch/org.eclipse.cdt.launch/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF index 9e6c26d08a1..b3d93fd1612 100644 --- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF +++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName 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-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.cdt.launch, - org.eclipse.cdt.launch.internal, - org.eclipse.cdt.launch.internal.ui, + org.eclipse.cdt.launch.internal;x-internal:=true, + org.eclipse.cdt.launch.internal.ui;x-internal:=true, org.eclipse.cdt.launch.ui 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)", @@ -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.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.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.variables;bundle-version="[3.1.100,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index abec41ee539..43e7508c9cf 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -98,6 +98,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * @exception CoreException * if unable to retrieve the attribute */ + @Deprecated public File getWorkingDir(ILaunchConfiguration configuration) throws CoreException { return getWorkingDirectory(configuration); } @@ -209,6 +210,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * @throws CoreException * @deprecated */ + @Deprecated protected void setSourceLocator(ILaunch launch, ILaunchConfiguration config) throws CoreException { setDefaultSourceLocator(launch, config); } @@ -310,6 +312,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat /** * @deprecated */ + @Deprecated protected String renderDebuggerProcessLabel() { String format = "{0} ({1})"; //$NON-NLS-1$ String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis())); @@ -324,6 +327,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * @throws CoreException * @deprecated Use verifyProgramFile instead. */ + @Deprecated protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException { ICProject cproject = verifyCProject(config); String fileName = getProgramName(config); @@ -535,6 +539,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * @throws CoreException * if an exception occurrs while building */ + @Override 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. //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 * if an exception occurs while checking for compile errors. */ + @Override public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { boolean continueLaunch = true; if(orderedProjects == null) { @@ -681,6 +687,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * @param proj * The project to search * @return true if compile errors exist, otherwise false + * @since 6.0 */ protected boolean existsErrors(IProject proj) throws CoreException { 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, * java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { if(monitor == null) { monitor = new NullProgressMonitor(); @@ -820,6 +828,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * name=value * @deprecated */ + @Deprecated protected String[] getEnvironmentArray(ILaunchConfiguration config) { Map env = null; try { @@ -844,6 +853,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat * does not include the default environment of the target. * @deprecated */ + @Deprecated protected Properties getEnvironmentProperty(ILaunchConfiguration config) { Properties prop = new Properties(); Map env = null; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 2acaecaf41e..b9d80510b63 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -90,6 +90,9 @@ public class CMainTab extends CLaunchConfigurationTab { protected Label fProgLabel; protected Text fProgText; protected Button fSearchButton; + /** + * @since 6.0 + */ protected Combo fBuildConfigCombo; private final boolean fWantsTerminalOption; @@ -142,6 +145,9 @@ public class CMainTab extends CLaunchConfigurationTab { LaunchUIPlugin.setDialogShell(parent.getShell()); } + /** + * @since 6.0 + */ protected void createProjectGroup(Composite parent, int colSpan) { Composite projComp = new Composite(parent, SWT.NONE); 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.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleProjectButtonSelected(); updateLaunchConfigurationDialog(); @@ -180,6 +187,9 @@ public class CMainTab extends CLaunchConfigurationTab { }); } + /** + * @since 6.0 + */ protected void updateBuildConfigCombo(String selectedConfigID) { fBuildConfigCombo.removeAll(); 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) { Composite comboComp = new Composite(parent, SWT.NONE); 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.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleSearchButtonSelected(); updateLaunchConfigurationDialog(); @@ -265,6 +279,7 @@ public class CMainTab extends CLaunchConfigurationTab { Button fBrowseForBinaryButton; fBrowseForBinaryButton = createPushButton(mainComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$ fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleBinaryBrowseButtonSelected(); updateLaunchConfigurationDialog(); @@ -290,6 +305,7 @@ public class CMainTab extends CLaunchConfigurationTab { fTerminalButton = createCheckButton(mainComp, LaunchMessages.getString("CMainTab.UseTerminal")); //$NON-NLS-1$ fTerminalButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { updateLaunchConfigurationDialog(); } @@ -376,6 +392,7 @@ public class CMainTab extends CLaunchConfigurationTab { ILabelProvider programLabelProvider = new CElementLabelProvider() { + @Override public String getText(Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; @@ -386,6 +403,7 @@ public class CMainTab extends CLaunchConfigurationTab { return super.getText(element); } + @Override public Image getImage(Object element) { if (! (element instanceof ICElement)) { return super.getImage(element); @@ -405,6 +423,7 @@ public class CMainTab extends CLaunchConfigurationTab { ILabelProvider qualifierLabelProvider = new CElementLabelProvider() { + @Override public String getText(Object element) { if (element instanceof IBinary) { 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) */ + @Override public boolean isValid(ILaunchConfiguration config) { setErrorMessage(null); @@ -774,6 +794,7 @@ public class CMainTab extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage() */ + @Override public Image getImage() { return LaunchImages.get(LaunchImages.IMG_VIEW_MAIN_TAB); } @@ -783,6 +804,7 @@ public class CMainTab extends CLaunchConfigurationTab { * * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog() */ + @Override protected void updateLaunchConfigurationDialog() { super.updateLaunchConfigurationDialog(); }