From 0266cab7e928552fd3efb26f2c0f0b240e0b2667 Mon Sep 17 00:00:00 2001 From: Marcel Du Preez <92920738+MarcelS4@users.noreply.github.com> Date: Sun, 23 Oct 2022 13:56:31 +0200 Subject: [PATCH] Fixed missing elements from Designer Palette Context Menu (#337) Fixed missing elements from Designer Palette Context Menu by adding in old code that was removed during commit of new feature --- .../editor/palette/DesignerPalettePopupActions.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java index 1af6fdc90..4ccad6484 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalettePopupActions.java @@ -12,6 +12,7 @@ package org.eclipse.wb.internal.core.editor.palette; import org.eclipse.wb.core.controls.palette.IPalette; +import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants; import org.eclipse.wb.core.editor.palette.model.CategoryInfo; import org.eclipse.wb.core.editor.palette.model.EntryInfo; import org.eclipse.wb.core.editor.palette.model.entry.ComponentEntryInfo; @@ -23,6 +24,7 @@ import org.eclipse.wb.internal.core.utils.execution.ExecutionUtils; import org.eclipse.wb.internal.core.utils.execution.RunnableEx; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; @@ -34,6 +36,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; +import org.osgi.service.prefs.Preferences; + import java.text.MessageFormat; /** @@ -102,6 +106,15 @@ public void run() { } private void addPopupActions_edit(IMenuManager menuManager, Object target, int type) { + + Preferences preferences = InstanceScope.INSTANCE + .getNode(IEditorPreferenceConstants.WB_BASIC_UI_PREFERENCE_NODE); + boolean windowbuilderBasic = preferences.getBoolean(IEditorPreferenceConstants.WB_BASIC_UI, false); + + if (!windowbuilderBasic) { + addPopupActions_edit_unUsed(menuManager, target); + menuManager.add(new Separator()); + } // add layout action { IMenuManager layoutMenuManager = new MenuManager("Layout");