From 1f3c3e1170bd2219b35b626556b0de793e0a3af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 5 Jun 2024 10:20:39 +0200 Subject: [PATCH] Revert "Store properties dialog bounds. (#1282)" fixes #1895 This reverts commit 8abe1b1ffbf40769264b908012034f4060bef04b. The PreferenceDialog has a custom size calculation that tries to adapt to the current page. That contradicts using the the former size https://github.com/eclipse-platform/eclipse.platform.ui/issues/1895 --- bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF | 2 +- .../eclipse/ui/internal/dialogs/PropertyDialog.java | 11 ----------- bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF index b2d5cbb9302..64b62e924a6 100644 --- a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true -Bundle-Version: 3.22.200.qualifier +Bundle-Version: 3.22.300.qualifier Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Plugin.providerName diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java index 0bca15c1800..538e049600c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java @@ -17,8 +17,6 @@ import java.util.Iterator; import org.eclipse.core.runtime.Adapters; -import org.eclipse.jface.dialogs.DialogSettings; -import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.PreferenceManager; @@ -31,10 +29,8 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.IWorkbenchHelpContextIds; import org.eclipse.ui.internal.WorkbenchMessages; -import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.model.IContributionService; import org.eclipse.ui.model.IWorkbenchAdapter; -import org.osgi.framework.Bundle; /** * This dialog is created and shown when 'Properties' action is performed while @@ -184,11 +180,4 @@ protected String getContributionType() { return IContributionService.TYPE_PROPERTY; } - @Override - protected IDialogSettings getDialogBoundsSettings() { - Bundle bundle = WorkbenchPlugin.getDefault().getBundle(); - IDialogSettings settings = PlatformUI.getDialogSettingsProvider(bundle).getDialogSettings(); - String name = getClass().getSimpleName() + ".dialogBounds"; //$NON-NLS-1$ - return DialogSettings.getOrCreateSection(settings, name); - } } diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF index e5c807580b1..0d745f6d08b 100644 --- a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true -Bundle-Version: 3.132.0.qualifier +Bundle-Version: 3.132.100.qualifier Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName