mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-03 14:25:37 +02:00
[fix] Menu group marker "additions" not consistently added to new sub menu
This commit is contained in:
parent
1071df698c
commit
734ad54b12
3 changed files with 6 additions and 4 deletions
|
@ -776,7 +776,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy
|
|||
if (selectionCount == 0) // nothing selected
|
||||
{
|
||||
menu.add(getNewConnectionAction());
|
||||
menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
|
||||
menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
|
||||
} else {
|
||||
if (selectionCount > 1) {
|
||||
allSelectionsFromSameParent = sameParent();
|
||||
|
|
|
@ -21,6 +21,7 @@ import java.util.Vector;
|
|||
|
||||
import org.eclipse.core.runtime.IAdaptable;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.jface.action.GroupMarker;
|
||||
import org.eclipse.jface.resource.ImageDescriptor;
|
||||
import org.eclipse.jface.viewers.ICellEditorValidator;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
|
@ -32,6 +33,7 @@ import org.eclipse.rse.core.model.IHost;
|
|||
import org.eclipse.rse.core.model.ISystemRegistry;
|
||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||
import org.eclipse.rse.model.ISystemRegistryUI;
|
||||
import org.eclipse.rse.ui.ISystemContextMenuConstants;
|
||||
import org.eclipse.rse.ui.ISystemMessages;
|
||||
import org.eclipse.rse.ui.RSESystemTypeAdapter;
|
||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||
|
@ -60,7 +62,6 @@ import org.eclipse.rse.ui.view.ISystemPropertyConstants;
|
|||
import org.eclipse.rse.ui.view.ISystemViewInputProvider;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.dialogs.PropertyDialogAction;
|
||||
import org.eclipse.ui.views.framelist.GoIntoAction;
|
||||
import org.eclipse.ui.views.properties.IPropertyDescriptor;
|
||||
import org.eclipse.ui.views.properties.PropertyDescriptor;
|
||||
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
|
||||
|
@ -133,8 +134,10 @@ public class SystemViewConnectionAdapter
|
|||
|
||||
//updateAction.setValue(null); // reset
|
||||
if (sysTypeAdapter == null
|
||||
|| sysTypeAdapter.acceptContextMenuActionContribution(host, anotherConnectionAction.getClass()))
|
||||
|| sysTypeAdapter.acceptContextMenuActionContribution(host, anotherConnectionAction.getClass())) {
|
||||
menu.add(menuGroup, anotherConnectionAction);
|
||||
menu.appendToGroup(menuGroup, new GroupMarker(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
|
||||
}
|
||||
|
||||
if (sysTypeAdapter == null
|
||||
|| sysTypeAdapter.acceptContextMenuActionContribution(host, copyAction.getClass()))
|
||||
|
|
|
@ -101,7 +101,6 @@ public class SystemNewConnectionAction extends SystemBaseWizardAction {
|
|||
this.fromPopupMenu = fromPopupMenu;
|
||||
this.sp = sp;
|
||||
setHelp(RSEUIPlugin.HELPPREFIX + "actn0000"); //$NON-NLS-1$
|
||||
setId("org.eclipse.rse.ui.action.newconnection"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue