mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-05 07:15:39 +02:00
Fix up some problems found against the latest API baseline.
Change-Id: I5679b36166385b617a96ef8180bbd27ae002e900
This commit is contained in:
parent
f96887cb35
commit
b9359d5247
6 changed files with 14 additions and 3 deletions
|
@ -33,6 +33,8 @@ import org.eclipse.core.runtime.PlatformObject;
|
||||||
*
|
*
|
||||||
* TODO leaving most of the implementation as default. I don't think any of these methods get called when
|
* TODO leaving most of the implementation as default. I don't think any of these methods get called when
|
||||||
* we're in this error state but we'll keep an eye open for NPE's and bad behavior.
|
* we're in this error state but we'll keep an eye open for NPE's and bad behavior.
|
||||||
|
*
|
||||||
|
* @since 6.9
|
||||||
*/
|
*/
|
||||||
public class ErrorBuildConfiguration extends PlatformObject implements ICBuildConfiguration, ICBuildConfiguration2 {
|
public class ErrorBuildConfiguration extends PlatformObject implements ICBuildConfiguration, ICBuildConfiguration2 {
|
||||||
|
|
||||||
|
|
|
@ -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.core; singleton:=true
|
Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
|
||||||
Bundle-Version: 8.3.300.qualifier
|
Bundle-Version: 8.4.0.qualifier
|
||||||
Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
|
Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
|
|
|
@ -68,6 +68,9 @@ public class CoreBuildLaunchBarTracker implements ILaunchBarListener, ILaunchTar
|
||||||
targetManager.addListener(this);
|
targetManager.addListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 8.4
|
||||||
|
*/
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
targetManager.removeListener(this);
|
targetManager.removeListener(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,6 +117,7 @@ public class LaunchUtils {
|
||||||
* @param configuration Launch configuration to obtain paths from
|
* @param configuration Launch configuration to obtain paths from
|
||||||
* @return the program path
|
* @return the program path
|
||||||
* @throws CoreException if program path can not be resolved.
|
* @throws CoreException if program path can not be resolved.
|
||||||
|
* @since 9.3
|
||||||
*/
|
*/
|
||||||
public static String getProgramPath(ILaunchConfiguration configuration) throws CoreException {
|
public static String getProgramPath(ILaunchConfiguration configuration) throws CoreException {
|
||||||
return resolveProgramPath(configuration, null);
|
return resolveProgramPath(configuration, null);
|
||||||
|
@ -129,6 +130,7 @@ public class LaunchUtils {
|
||||||
* @param programName Optional (can be null) starting point for program name
|
* @param programName Optional (can be null) starting point for program name
|
||||||
* @return the program path
|
* @return the program path
|
||||||
* @throws CoreException if program path can not be resolved.
|
* @throws CoreException if program path can not be resolved.
|
||||||
|
* @since 9.3
|
||||||
*/
|
*/
|
||||||
public static String resolveProgramPath(ILaunchConfiguration configuration, String programName)
|
public static String resolveProgramPath(ILaunchConfiguration configuration, String programName)
|
||||||
throws CoreException {
|
throws CoreException {
|
||||||
|
@ -170,6 +172,7 @@ public class LaunchUtils {
|
||||||
* @param configuration Launch configuration to obtain project from
|
* @param configuration Launch configuration to obtain project from
|
||||||
* @return the project
|
* @return the project
|
||||||
* @throws CoreException
|
* @throws CoreException
|
||||||
|
* @since 9.3
|
||||||
*/
|
*/
|
||||||
public static IProject getProject(ILaunchConfiguration configuration) throws CoreException {
|
public static IProject getProject(ILaunchConfiguration configuration) throws CoreException {
|
||||||
String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME,
|
String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME,
|
||||||
|
@ -256,7 +259,6 @@ public class LaunchUtils {
|
||||||
/**
|
/**
|
||||||
* @since 6.1
|
* @since 6.1
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public static void enableActivity(final String activityID, final boolean enableit) {
|
public static void enableActivity(final String activityID, final boolean enableit) {
|
||||||
if (PlatformUI.isWorkbenchRunning()) {
|
if (PlatformUI.isWorkbenchRunning()) {
|
||||||
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
|
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
|
||||||
|
@ -264,7 +266,7 @@ public class LaunchUtils {
|
||||||
public void run() {
|
public void run() {
|
||||||
IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
|
IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
|
||||||
IActivityManager activityManager = workbenchActivitySupport.getActivityManager();
|
IActivityManager activityManager = workbenchActivitySupport.getActivityManager();
|
||||||
Set<String> enabledActivityIds = new HashSet<String>(activityManager.getEnabledActivityIds());
|
Set<String> enabledActivityIds = new HashSet<>(activityManager.getEnabledActivityIds());
|
||||||
boolean changed = false;
|
boolean changed = false;
|
||||||
if (enableit)
|
if (enableit)
|
||||||
changed = enabledActivityIds.add(activityID);
|
changed = enabledActivityIds.add(activityID);
|
||||||
|
|
|
@ -12,6 +12,9 @@ package org.eclipse.cdt.launch;
|
||||||
|
|
||||||
import org.eclipse.osgi.util.NLS;
|
import org.eclipse.osgi.util.NLS;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 9.3
|
||||||
|
*/
|
||||||
public class Messages extends NLS {
|
public class Messages extends NLS {
|
||||||
private static final String BUNDLE_NAME = "org.eclipse.cdt.launch.messages"; //$NON-NLS-1$
|
private static final String BUNDLE_NAME = "org.eclipse.cdt.launch.messages"; //$NON-NLS-1$
|
||||||
public static String LaunchUtils__0_not_found;
|
public static String LaunchUtils__0_not_found;
|
||||||
|
|
|
@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Text;
|
||||||
/**
|
/**
|
||||||
* A launch configuration tab that displays and edits program arguments,
|
* A launch configuration tab that displays and edits program arguments,
|
||||||
* and working directory launch configuration attributes.
|
* and working directory launch configuration attributes.
|
||||||
|
* @since 9.3
|
||||||
*/
|
*/
|
||||||
public abstract class CAbstractArgumentsTab extends CLaunchConfigurationTab {
|
public abstract class CAbstractArgumentsTab extends CLaunchConfigurationTab {
|
||||||
// Program arguments UI widgets
|
// Program arguments UI widgets
|
||||||
|
|
Loading…
Add table
Reference in a new issue