Skip to content

Commit

Permalink
Revert "Move long running operations to the activation of the
Browse files Browse the repository at this point in the history
PluginsTab"

This change reverts main change from commit
98a5865 changes because it caused a
severe regression.

See eclipse-pde#1233

Fixes eclipse-pde#1250
  • Loading branch information
iloveeclipse committed Apr 24, 2024
1 parent 65942e1 commit 1dd4729
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
3 changes: 2 additions & 1 deletion org.eclipse.pde.doc.user/forceQualifierUpdate.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Comparator Errors in 4.32 I-Build I20240304-0140
Comparator Errors in 4.32 I-Build I20240304-0140
https://github.com/eclipse-pde/eclipse.pde/issues/1250
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public class PluginsTab extends AbstractLauncherTab {
private Combo fDefaultAutoStart;
private Spinner fDefaultStartLevel;
private final Listener fListener;
private boolean fActivated;

private static final int DEFAULT_SELECTION = 0;
private static final int PLUGIN_SELECTION = 1;
Expand Down Expand Up @@ -157,16 +156,6 @@ public void createControl(Composite parent) {

@Override
public void initializeFrom(ILaunchConfiguration configuration) {
// Long-running initialization happens on first activation of this tab
}

@Override
public void activated(ILaunchConfigurationWorkingCopy configuration) {
if (fActivated) {
// Since this method can be expensive, only activate this tab once.
return;
}

try {
int index = DEFAULT_SELECTION;
if (configuration.getAttribute(IPDELauncherConstants.USE_CUSTOM_FEATURES, false)) {
Expand All @@ -182,9 +171,6 @@ public void activated(ILaunchConfigurationWorkingCopy configuration) {
fDefaultAutoStart.setText(Boolean.toString(auto));
int level = configuration.getAttribute(IPDELauncherConstants.DEFAULT_START_LEVEL, 4);
fDefaultStartLevel.setSelection(level);

// If everything ran smoothly, this tab is activated
fActivated = true;
} catch (CoreException e) {
PDEPlugin.log(e);
}
Expand All @@ -202,9 +188,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
int index = fSelectionCombo.getSelectionIndex();
configuration.setAttribute(IPDELauncherConstants.USE_DEFAULT, index == DEFAULT_SELECTION);
configuration.setAttribute(IPDELauncherConstants.USE_CUSTOM_FEATURES, index == FEATURE_SELECTION);
if (fActivated) {
fBlock.performApply(configuration);
}
fBlock.performApply(configuration);
// clear default values for auto-start and start-level if default
String autoText = fDefaultAutoStart.getText();
if (Boolean.toString(false).equals(autoText)) {
Expand Down Expand Up @@ -233,9 +217,16 @@ public Image getImage() {
return fImage;
}

/**
* Validates the tab. If the feature option is chosen, and the workspace is not correctly set up,
* the error message is set.
*
* @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
*/
@Override
public void validateTab() {
setErrorMessage(null);
String errorMessage = null;
setErrorMessage(errorMessage);
}

@Override
Expand Down

0 comments on commit 1dd4729

Please sign in to comment.