From 2a6339baf92cfdc6c7fda2a1b1df5baa4092cdd9 Mon Sep 17 00:00:00 2001
From: sougandhs <sougandh.s@ibm.com>
Date: Fri, 29 Nov 2024 09:49:21 +0530
Subject: [PATCH] Additional Separator #549

This PR provides additional separation and arrangements between
Enable/Disable Actions in breakpoints view. New actions can be
contributed here.

Part of Enhancement #https://github.com/eclipse-jdt/eclipse.jdt.debug/pull/550
---
 debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF      |  2 +-
 debug/org.eclipse.debug.ui/plugin.xml                | 12 ++++++------
 .../ui/views/breakpoints/BreakpointsView.java        |  3 +++
 .../ui/org/eclipse/debug/ui/IDebugUIConstants.java   |  8 ++++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index 5a93c387331..2c08e5c90b7 100644
--- a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.18.700.qualifier
+Bundle-Version: 3.18.500.qualifier
 Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.debug.ui/plugin.xml b/debug/org.eclipse.debug.ui/plugin.xml
index f3ecf97274e..8ba69f58a3a 100644
--- a/debug/org.eclipse.debug.ui/plugin.xml
+++ b/debug/org.eclipse.debug.ui/plugin.xml
@@ -1505,14 +1505,14 @@
                definitionId="org.eclipse.ui.edit.copy"
                helpContextId="copy_breakpoints_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpointGroups.CopyBreakpointsActionDelegate"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                id="org.eclipse.debug.ui.breakpointsView.toolbar.copy"/>
          <action
                label="%SelectAll.label"
                helpContextId="select_all_breakpoints_action_context"
                definitionId="org.eclipse.ui.edit.selectAll"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.SelectAllBreakpointsAction"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                id="org.eclipse.debug.ui.actions.SelectAllBreakpointsAction">
          </action>
          <action
@@ -1520,7 +1520,7 @@
                icon="$nl$/icons/full/elcl16/rem_all_co.png"
                helpContextId="remove_all_breakpoints_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllBreakpointsAction"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                id="org.eclipse.debug.ui.actions.RemoveAllBreakpoints">
          </action>
          <action
@@ -1528,7 +1528,7 @@
                icon="$nl$/icons/full/elcl16/rem_all_triggers.png"
                helpContextId="remove_all_breakpoints_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllTriggerPointsAction"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                id="org.eclipse.debug.ui.actions.RemoveAllTriggerpoints">
          </action>
         <action
@@ -1536,7 +1536,7 @@
                icon="$nl$/icons/full/elcl16/rem_co.png"
                helpContextId="remove_breakpoint_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveBreakpointAction"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                enablesFor="+"
                id="org.eclipse.debug.ui.breakpointsView.toolbar.remove">
         </action>
@@ -1545,7 +1545,7 @@
                icon="$nl$/icons/full/elcl16/disabled_co.png"
                helpContextId="disable_breakpoint_action_context"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.DisableAllBreakpointsAction"
-               menubarPath="breakpointGroup"
+               menubarPath="BreakpointAdditionalGroup"
                id="org.eclipse.debug.ui.actions.DisableAllBreakpoint">
         </action>
         <action
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
index a681804be00..58830983b4c 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
@@ -196,6 +196,9 @@ protected void fillContextMenu(IMenuManager menu) {
 		menu.add(getAction(ACTION_GOTO_MARKER));
 		menu.add(new Separator(IDebugUIConstants.EMPTY_BREAKPOINT_GROUP));
 		menu.add(new Separator(IDebugUIConstants.BREAKPOINT_GROUP));
+		Separator separator = new Separator(IDebugUIConstants.BREAKPOINT_ADDITIONAL_GROUP);
+		separator.setVisible(false);
+		menu.add(separator);
 		IAction action = getAction(PASTE_ACTION);
 		if (action != null) {
 			menu.add(action);
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
index 208e033e87a..4f759531215 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
@@ -774,6 +774,14 @@ public interface IDebugUIConstants {
 	 */
 	String BREAKPOINT_GROUP = "breakpointGroup"; //$NON-NLS-1$
 
+	/**
+	 * Identifier for breakpoint operations other than enable/disable succeeding a
+	 * breakpoint group in a menu (value <code>"BreakpointAdditionalGroup"</code>).
+	 *
+	 * @since 3.18
+	 */
+	String BREAKPOINT_ADDITIONAL_GROUP = "BreakpointAdditionalGroup"; //$NON-NLS-1$
+
 	/**
 	 * Identifier for a "breakpoint group" group in a menu (value <code>"breakpointGroupGroup"</code>).
 	 *