Support - New Recently Used Submenu #1837
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,17 @@ | |
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| * Alexander Fedorov <[email protected]> - Bug 548428 | ||
| * Dinesh Palanisamy (ETAS GmbH) - Issue 1530 | ||
| *******************************************************************************/ | ||
| package org.eclipse.ui.actions; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
| import java.util.Iterator; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.jface.action.ActionContributionItem; | ||
| import org.eclipse.jface.action.IAction; | ||
|
|
@@ -28,6 +33,7 @@ | |
| import org.eclipse.ui.activities.WorkbenchActivityHelper; | ||
| import org.eclipse.ui.internal.WorkbenchPlugin; | ||
| import org.eclipse.ui.internal.actions.NewWizardShortcutAction; | ||
| import org.eclipse.ui.internal.dialogs.DynamicMenuSelection; | ||
| import org.eclipse.ui.internal.dialogs.WorkbenchWizardElement; | ||
| import org.eclipse.ui.internal.registry.WizardsRegistryReader; | ||
| import org.eclipse.ui.wizards.IWizardCategory; | ||
|
|
@@ -186,9 +192,29 @@ protected void addItems(List<IContributionItem> list) { | |
| list.add(new ActionContributionItem(newExampleAction)); | ||
| list.add(new Separator()); | ||
| } | ||
|
|
||
| // To add shortcuts from OTHER... wizard regardless of perspective | ||
| Collection<IContributionItem> otherItems = new LinkedList<>(); | ||
| if (!DynamicMenuSelection.getInstance().getSelectedFromOther().isEmpty()) { | ||
| for (String selectedItemsFormOthers : DynamicMenuSelection.getInstance().getSelectedFromOther()) { | ||
| IAction action = getAction(selectedItemsFormOthers); | ||
| otherItems.add(new ActionContributionItem(action)); | ||
| } | ||
| dynamicMenuCheck(list, otherItems); | ||
| } | ||
| list.add(new ActionContributionItem(getShowDialogAction())); | ||
| } | ||
|
|
||
| private void dynamicMenuCheck(List<IContributionItem> list, Collection<IContributionItem> otherItems) { | ||
| Set<IContributionItem> existingShortcutsInPerspective = new HashSet<>(list); | ||
| for (IContributionItem item : otherItems) { | ||
| if (!existingShortcutsInPerspective.contains(item)) { | ||
| list.add(item); | ||
| existingShortcutsInPerspective.add(item); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private boolean isNewProjectWizardAction(IAction action) { | ||
| if (action instanceof NewWizardShortcutAction) { | ||
| IWizardDescriptor wizardDescriptor= ((NewWizardShortcutAction) action).getWizardDescriptor(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2023 ETAS GmbH and others, all rights reserved. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * ETAS GmbH - initial API and implementation | ||
| *******************************************************************************/ | ||
|
|
||
| package org.eclipse.ui.internal.dialogs; | ||
|
|
||
| import java.util.Iterator; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * @since 3.5 | ||
| * | ||
| */ | ||
| public class DynamicMenuSelection { | ||
| private Set<String> selectedFromOther = new LinkedHashSet<>(); | ||
| private static DynamicMenuSelection instance; | ||
| private static final int MAX_MENU_SIZE = 5; | ||
|
|
||
| public static DynamicMenuSelection getInstance() { | ||
| synchronized (DynamicMenuSelection.class) { | ||
| if (instance == null) { | ||
| instance = new DynamicMenuSelection(); | ||
| } | ||
| return instance; | ||
| } | ||
| } | ||
|
|
||
| public void addItems(String shortcuts) { | ||
| selectedFromOther.add(shortcuts); | ||
| if (selectedFromOther.size() > MAX_MENU_SIZE) { | ||
| Iterator<String> iterator = selectedFromOther.iterator(); | ||
| iterator.next(); | ||
| iterator.remove(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return Returns the selectedFromOther. | ||
| */ | ||
| public Set<String> getSelectedFromOther() { | ||
| return selectedFromOther; | ||
| } | ||
|
Comment on lines
+51
to
+53
Member
There was a problem hiding this comment. Please return an immutable set to avoid calls like the one you used in |
||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2023 ETAS GmbH and others, all rights reserved. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * ETAS GmbH - initial API and implementation | ||
| *******************************************************************************/ | ||
|
|
||
| package org.eclipse.ui.workbench; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import com.google.gson.reflect.TypeToken; | ||
| import java.lang.reflect.Type; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import org.eclipse.core.runtime.preferences.IEclipsePreferences; | ||
| import org.eclipse.core.runtime.preferences.InstanceScope; | ||
|
|
||
| public class DynamicMenuItem { | ||
|
Member
There was a problem hiding this comment. Please add some JavaDoc to the class and also to the public methods.
Contributor
There was a problem hiding this comment. If this is to become a new API class, then it requires proper Javadoc and
Contributor
There was a problem hiding this comment. But it would be even better if this could remain internal.
Contributor
There was a problem hiding this comment. Also, DynamicMenuItem is not a great name, especially if it's meant to serve only the newWizard case. I think it would be better to have this nested in the NewWizardNewPage or something, with more narrowly-scope names for preferences.
Contributor
There was a problem hiding this comment. @mickaelistria This cannot be nested in |
||
|
|
||
| private static final String PLUGIN_ID = "org.eclipse.ui.workbench"; //$NON-NLS-1$ | ||
| private static final String DYNAMIC_MENU_ITEMS = "dynamicMenuItems"; //$NON-NLS-1$ | ||
|
|
||
| public List<String> getDynamicMenuItems() { | ||
| IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(PLUGIN_ID); | ||
| String jsn = pref.get(DYNAMIC_MENU_ITEMS, null); | ||
| if (jsn != null) { | ||
| Gson gsn = new Gson(); | ||
|
Contributor
There was a problem hiding this comment. GSon is a relatively heavy library to use for this case. Can you try avoiding it, for example by storing/reading the list as comma-separated ids and use |
||
| Type typ = new TypeToken<List<String>>() { | ||
| }.getType(); | ||
| return gsn.fromJson(jsn, typ); | ||
| } | ||
fedejeanne marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return new ArrayList<>(); | ||
| } | ||
|
|
||
| public void setDynamicMenuItems(Set<String> set) { | ||
|
Member
There was a problem hiding this comment. Rename this parameter to reflect what it represents and not what it is. One can see this is a set by looking at the type but one doesn't know what the set contains (I bet |
||
| IEclipsePreferences pref = InstanceScope.INSTANCE.getNode(PLUGIN_ID); | ||
| Gson gsn = new Gson(); | ||
| String jsn = gsn.toJson(set); | ||
| pref.put(DYNAMIC_MENU_ITEMS, jsn); | ||
| try { | ||
| pref.flush(); | ||
| } catch (org.osgi.service.prefs.BackingStoreException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please merged with already existing Javadoc block.