commit | 35425c5c4e8141d5fd16b02977905a5e225cfd61 | [log] [tgz] |
---|---|---|
author | Andrey Loskutov <loskutov@gmx.de> | Wed Jan 19 15:26:08 2022 +0100 |
committer | Andrey Loskutov <loskutov@gmx.de> | Wed Jan 19 09:59:22 2022 -0500 |
tree | 1034133f30681055e9d007958dfc6b8878d64ca6 | |
parent | 81afb4771709e49140c440fcd19a50823fdbf04a [diff] |
Bug 577289 - fix IDE preferences initialization issue See https://bugs.eclipse.org/bugs/show_bug.cgi?id=577289#c5 At the time we've asked to init IDEPreferenceInitializer we can't use anything from Workbench UI plugin, because that one relies on initialized resources bundle, that is not initialized because the workspace is not selected yet... Change-Id: I83c22a801e700145985427aa1fb4ac132bd5140c Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/189781 Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java index fe5db5c..a11cba4 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java
@@ -22,7 +22,6 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPreferenceConstants; import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.internal.LargeFileLimitsPreferenceHandler; import org.eclipse.ui.internal.ide.handlers.ShowInSystemExplorerHandler; import org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy; @@ -97,8 +96,6 @@ // by default the problem view should check whether help context is really // available. node.putBoolean(IDEInternalPreferences.HELP_CONTEXT_AVAILABILITY_CHECK, true); - - LargeFileLimitsPreferenceHandler.setDefaults(); } /**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java index 77ca509..20737e8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
@@ -142,6 +142,7 @@ WorkbenchPlugin.getDefault().getLog().log(status); } + LargeFileLimitsPreferenceHandler.setDefaults(); } }