diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 5bcc4dfc545..73fdf7667f7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -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(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java index 2273a7a3e71..41e85bbeb06 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java @@ -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())) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java index 446d5c22dd5..3e387e44373 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java @@ -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$ } /**