Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
Bundle-Version: 3.21.100.qualifier
Bundle-Version: 3.22.0.qualifier
Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
42 changes: 28 additions & 14 deletions debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ IDialogSettings getDialogBoundsSettings(String id) {
/**
* Creates the favorites control
* @param parent the parent composite to add this one to
* @since 3.2
* @since 3.22
*/
private void createFavoritesComponent(Composite parent) {
protected void createFavoritesComponent(Composite parent) {
Group favComp = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.CommonTab_Display_in_favorites_menu__10, 1, 1, GridData.FILL_BOTH);
fFavoritesTable = CheckboxTableViewer.newCheckList(favComp, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
Control table = fFavoritesTable.getControl();
Expand All @@ -222,9 +222,9 @@ private void createFavoritesComponent(Composite parent) {
/**
* Creates the shared config component
* @param parent the parent composite to add this component to
* @since 3.2
* @since 3.22
*/
private void createSharedConfigComponent(Composite parent) {
protected void createSharedConfigComponent(Composite parent) {
Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.CommonTab_0, 3, 2, GridData.FILL_HORIZONTAL);
Composite comp = SWTFactory.createComposite(group, parent.getFont(), 3, 3, GridData.FILL_BOTH, 0, 0);
fLocalRadioButton = createRadioButton(comp, LaunchConfigurationsMessages.CommonTab_L_ocal_3);
Expand Down Expand Up @@ -660,6 +660,24 @@ private IContainer getContainer(String path) {

@Override
public void initializeFrom(ILaunchConfiguration configuration) {
updateSharedConfig(configuration);
updateFavoritesFromConfig(configuration);
updateLaunchInBackground(configuration);
updateEncoding(configuration);
updateConsoleOutput(configuration);

boolean terminateDescendants = getAttribute(configuration, DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
fTerminateDescendantsButton.setSelection(terminateDescendants);
}

/**
* Updates a configuration with the values set in the section for shared
* configurations.
*
* @param configuration the configuration to update
* @since 3.22
*/
protected void updateSharedConfig(ILaunchConfiguration configuration) {
boolean isShared = !configuration.isLocal();
fSharedRadioButton.setSelection(isShared);
fLocalRadioButton.setSelection(!isShared);
Expand All @@ -676,13 +694,6 @@ public void initializeFrom(ILaunchConfiguration configuration) {
}
fSharedLocationText.setText(containerName);
}
updateFavoritesFromConfig(configuration);
updateLaunchInBackground(configuration);
updateEncoding(configuration);
updateConsoleOutput(configuration);

boolean terminateDescendants = getAttribute(configuration, DebugPlugin.ATTR_TERMINATE_DESCENDANTS, true);
fTerminateDescendantsButton.setSelection(terminateDescendants);
}

/**
Expand Down Expand Up @@ -802,9 +813,10 @@ public static boolean isLaunchInBackground(ILaunchConfiguration configuration) {
/**
* Updates the favorites selections from the local configuration
* @param config the local configuration
* @since 3.22
*/
@SuppressWarnings("deprecation")
private void updateFavoritesFromConfig(ILaunchConfiguration config) {
protected void updateFavoritesFromConfig(ILaunchConfiguration config) {
fFavoritesTable.setInput(config);
fFavoritesTable.setCheckedElements(new Object[]{});
List<String> groups = getAttribute(config, IDebugUIConstants.ATTR_FAVORITE_GROUPS, new ArrayList<>());
Expand Down Expand Up @@ -833,8 +845,9 @@ private void updateFavoritesFromConfig(ILaunchConfiguration config) {
/**
* Updates the configuration form the local shared config working copy
* @param config the local shared config working copy
* @since 3.22
*/
private void updateConfigFromLocalShared(ILaunchConfigurationWorkingCopy config) {
protected void updateConfigFromLocalShared(ILaunchConfigurationWorkingCopy config) {
if (isShared()) {
String containerPathString = fSharedLocationText.getText();
IContainer container = getContainer(containerPathString);
Expand Down Expand Up @@ -865,9 +878,10 @@ protected LaunchConfigurationManager getLaunchConfigurationManager() {
* when comparing if content is equal, since 'false' is default
* and will be missing for older configurations.
* @param config the configuration to update
* @since 3.22
*/
@SuppressWarnings("deprecation")
private void updateConfigFromFavorites(ILaunchConfigurationWorkingCopy config) {
protected void updateConfigFromFavorites(ILaunchConfigurationWorkingCopy config) {
Object[] checked = fFavoritesTable.getCheckedElements();
boolean debug = getAttribute(config, IDebugUIConstants.ATTR_DEBUG_FAVORITE, false);
boolean run = getAttribute(config, IDebugUIConstants.ATTR_RUN_FAVORITE, false);
Expand Down
Loading