Bug 579149 - Large file editor chooser remembers selection for too long
After remembering an editor selection, for opening a large file,
canceling the respective dialog results in opening the previously
selected editor.
This change resets the values stored in DialogPromptForEditor, prior to
opening the editor selection dialog. This ensures canceling or closing
the dialog yields correct results.
Change-Id: I84937148c930b26cd5abb9c155507b46a009bb36
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/191609
Tested-by: Andrey Loskutov <loskutov@gmx.de>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
index 2048d77..f89bdac 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
@@ -542,6 +542,8 @@
@Override
public void prompt(IPath inputPath, FileLimit fileLimit) {
+ selectedEditor = null;
+ rememberSelection = false;
Shell shell = ProgressManagerUtil.getDefaultParent();
LargeFileEditorSelectionDialog dialog =
new LargeFileEditorSelectionDialog(shell, inputPath.getFileExtension(), fileLimit.fileSize);
@@ -569,13 +571,13 @@
private final long fileSize;
private Button rememberSelectionButton;
- private boolean rememberSelection = DEFAULT_REMEMBER_EDITOR_SELECTION;
+ private boolean rememberSelection;
public LargeFileEditorSelectionDialog(Shell shell, String extension, long size) {
super(shell);
this.extension = extension;
this.fileSize = size;
- rememberSelection = false;
+ rememberSelection = DEFAULT_REMEMBER_EDITOR_SELECTION;
}
@Override
