Fixes action owner usage

Author: dragonmacher

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/actions/ZoomInAAction.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ public class ZoomInAAction extends DockingAction {
 	private MemviewProvider provider;
 
 	public ZoomInAAction(MemviewProvider provider) {
-		super("Zoom In (Addrs)", provider.getName());
+		super("Zoom In (Addrs)", provider.getOwner());
 		this.provider = provider;
 		setEnabled(true);
 

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/actions/ZoomInTAction.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ public class ZoomInTAction extends DockingAction {
 	private MemviewProvider provider;
 
 	public ZoomInTAction(MemviewProvider provider) {
-		super("Zoom In (Time)", provider.getName());
+		super("Zoom In (Time)", provider.getOwner());
 		this.provider = provider;
 		setEnabled(true);
 

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/actions/ZoomOutAAction.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ public class ZoomOutAAction extends DockingAction {
 	private MemviewProvider provider;
 
 	public ZoomOutAAction(MemviewProvider provider) {
-		super("Zoom Out (Addrs)", provider.getName());
+		super("Zoom Out (Addrs)", provider.getOwner());
 		this.provider = provider;
 		setEnabled(true);
 

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memview/actions/ZoomOutTAction.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ public class ZoomOutTAction extends DockingAction {
 	private MemviewProvider provider;
 
 	public ZoomOutTAction(MemviewProvider provider) {
-		super("Zoom Out (Time)", provider.getName());
+		super("Zoom Out (Time)", provider.getOwner());
 		this.provider = provider;
 		setEnabled(true);
 

Ghidra/Extensions/sample/src/main/java/ghidra/examples/HelloWorldComponentProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,8 +37,8 @@ public class HelloWorldComponentProvider extends ComponentProviderAdapter {
 	private JPanel mainPanel;
 	private DockingAction action;
 
-	public HelloWorldComponentProvider(PluginTool tool, String name) {
-		super(tool, name, name);
+	public HelloWorldComponentProvider(PluginTool tool, String owner) {
+		super(tool, "Hello World", owner);
 		buildMainPanel();
 		setIcon(new GIcon("icon.sample.provider"));
 		setHelpLocation(HELP);
@@ -51,7 +51,7 @@ public HelloWorldComponentProvider(PluginTool tool, String name) {
 	private void createActions() {
 
 		// set actions for Hello->World menu item
-		action = new DockingAction("Hello World", getName()) {
+		action = new DockingAction("Hello World", getOwner()) {
 			@Override
 			public void actionPerformed(ActionContext context) {
 				// pop up a "Hello World" dialog
@@ -66,7 +66,7 @@ public void actionPerformed(ActionContext context) {
 		Icon icon = new GIcon("icon.sample.action.hello.world");
 		action.setMenuBarData(new MenuData(new String[] { "Misc", "Hello World" }, icon));
 		action.setKeyBindingData(
-			new KeyBindingData(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK)));
+			new KeyBindingData(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_DOWN_MASK)));
 
 		// puts the action on the local toolbar.
 		action.setToolBarData(new ToolBarData(icon));
@@ -77,7 +77,7 @@ public void actionPerformed(ActionContext context) {
 		addLocalAction(action);
 
 		//Example popup action
-		DockingAction popupAction = new DockingAction("Hello Popup", getName()) {
+		DockingAction popupAction = new DockingAction("Hello Popup", getOwner()) {
 			@Override
 			public void actionPerformed(ActionContext context) {
 				announce("Hello World");
@@ -136,9 +136,6 @@ public ActionContext getActionContext(MouseEvent event) {
 		return null;
 	}
 
-	/**
-	 * popup the Hello Dialog
-	 */
 	protected void announce(String message) {
 		Msg.showInfo(getClass(), mainPanel, "Hello World", message);
 	}
@@ -148,13 +145,7 @@ private class MyButton extends EmptyBorderButton {
 			super(name);
 			setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
 
-			addActionListener(new ActionListener() {
-
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					announce("Hello World");
-				}
-			});
+			addActionListener(e -> announce("Hello World"));
 		}
 	}
 }

Ghidra/Extensions/sample/src/main/java/ghidra/examples/ShowInfoComponentProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,8 +39,8 @@ public class ShowInfoComponentProvider extends ComponentProviderAdapter {
 	private Program currentProgram;
 	private ProgramLocation currentLocation;
 
-	public ShowInfoComponentProvider(PluginTool tool, String name) {
-		super(tool, name, name);
+	public ShowInfoComponentProvider(PluginTool tool, String owner) {
+		super(tool, "Show Location Info", owner);
 		create();
 		setIcon(PROVIDER_ICON);
 		setDefaultWindowPosition(WindowPosition.BOTTOM);
@@ -102,7 +102,7 @@ private void create() {
 	}
 
 	private void createActions() {
-		clearAction = new DockingAction("Clear Text Area", getName()) {
+		clearAction = new DockingAction("Clear Text Area", getOwner()) {
 			@Override
 			public void actionPerformed(ActionContext context) {
 				textArea.setText("");

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/overview/BSimOverviewProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -102,12 +102,14 @@ private void createActions() {
 		addLocalAction(new SelectionNavigationAction(plugin, table));
 		HelpLocation help =
 			new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Overview_Search_Info_Action");
-		new ActionBuilder("Search Info", getName()).toolBarIcon(Icons.INFO_ICON)
+		new ActionBuilder("Search Info", getOwner())
+				.toolBarIcon(Icons.INFO_ICON)
 				.helpLocation(help)
 				.onAction(c -> showSearchInfo())
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Make Selection", getOwner()).popupMenuPath("Make Selection")
+		new ActionBuilder("Make Selection", getOwner())
+				.popupMenuPath("Make Selection")
 				.description("Make a selection using selected rows")
 				.helpLocation(
 					new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Overview_Make_Selection"))

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/results/BSimSearchResultsProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -132,39 +132,45 @@ public void componentHidden() {
 	}
 
 	private void createActions() {
-		new ActionBuilder("Search Info", getName()).toolBarIcon(Icons.INFO_ICON)
+		new ActionBuilder("Search Info", getOwner())
+				.toolBarIcon(Icons.INFO_ICON)
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Search_Info_Action"))
 				.onAction(c -> showSearchInfo())
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Show Searched Functions", getName()).toolBarIcon(FUNCTIONS_ICON)
+		new ActionBuilder("Show Searched Functions", getOwner())
+				.toolBarIcon(FUNCTIONS_ICON)
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Searched_Functions"))
 				.onAction(c -> showSearchedFunctions())
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Filter Results", getName()).toolBarIcon(Icons.CONFIGURE_FILTER_ICON)
+		new ActionBuilder("Filter Results", getOwner())
+				.toolBarIcon(Icons.CONFIGURE_FILTER_ICON)
 				.helpLocation(
 					new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Filter_Results_Action"))
 				.onAction(c -> showFilterPanel())
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Filter Executable", getName()).popupMenuPath("Filter on this Executable")
+		new ActionBuilder("Filter Executable", getOwner())
+				.popupMenuPath("Filter on this Executable")
 				.description("Filter on a specific executable in the function match table")
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Filter_On_Executable"))
 				.withContext(ExecutableTableActionContext.class)
 				.enabledWhen(c -> c.getSelectedRowCount() == 1)
 				.onAction(this::filterOnExecutable)
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Load Executable", getName()).popupMenuPath("Load Executable")
+		new ActionBuilder("Load Executable", getOwner())
+				.popupMenuPath("Load Executable")
 				.description("Load the selected executable into the Codebrowser")
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Load_Executable"))
 				.withContext(ExecutableTableActionContext.class)
 				.enabledWhen(c -> c.getSelectedRowCount() == 1)
 				.onAction(this::loadExecutable)
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Compare Functions", getName()).popupMenuPath("Compare Functions")
+		new ActionBuilder("Compare Functions", getOwner())
+				.popupMenuPath("Compare Functions")
 				.popupMenuGroup("1")
 				.keyBinding("shift c")
 				.sharedKeyBinding()
@@ -175,23 +181,25 @@ private void createActions() {
 				.onAction(this::compareFunctions)
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Apply Function Name", getName()).popupMenuPath("Apply Name")
+		new ActionBuilder("Apply Function Name", getOwner())
+				.popupMenuPath("Apply Name")
 				.popupMenuGroup(APPLY_GROUP, "1")
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Apply_Name"))
 				.withContext(BSimMatchesTableActionContext.class)
 				.enabledWhen(c -> c.getSelectedRowCount() > 0)
 				.onAction(this::applyName)
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Apply Function Signature", getName()).popupMenuPath("Apply Signature")
+		new ActionBuilder("Apply Function Signature", getOwner())
+				.popupMenuPath("Apply Signature")
 				.popupMenuGroup(APPLY_GROUP, "2")
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Apply_Signature"))
 				.withContext(BSimMatchesTableActionContext.class)
 				.enabledWhen(c -> c.getSelectedRowCount() > 0)
 				.onAction(this::applySignature)
 				.buildAndInstallLocal(this);
 
-		new ActionBuilder("Apply Signature and Datatypes", getName())
+		new ActionBuilder("Apply Signature and Datatypes", getOwner())
 				.popupMenuPath("Apply Signature and Data Types")
 				.popupMenuGroup(APPLY_GROUP, "3")
 				.helpLocation(
@@ -201,7 +209,7 @@ private void createActions() {
 				.onAction(this::applySignatureWithDatatypes)
 				.buildAndInstallLocal(this);
 
-		showExecutableTableAction = new ToggleActionBuilder("Show Executables Table", getName())
+		showExecutableTableAction = new ToggleActionBuilder("Show Executables Table", getOwner())
 				.toolBarIcon(SPLIT_VIEW_ICON)
 				.description("Toggles showing Executables table")
 				.helpLocation(
@@ -212,7 +220,8 @@ private void createActions() {
 
 		addLocalAction(new SelectionNavigationAction(plugin, matchesTable.getTable()));
 
-		new ActionBuilder("Clear BSim Error Status", getName()).popupMenuPath("Clear error status")
+		new ActionBuilder("Clear BSim Error Status", getOwner())
+				.popupMenuPath("Clear error status")
 				.helpLocation(new HelpLocation(BSimSearchPlugin.HELP_TOPIC, "Clear_Error_Status"))
 				.withContext(BSimMatchesTableActionContext.class)
 				.enabledWhen(this::canClearErrors)

Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@ void dispose() {
 	public List<DockingActionIf> getPopupActions(Tool dt, ActionContext context) {
 		ListingPanel resultPanel = mergePanel.getResultPanel();
 		if (resultPanel != null) {
-			return resultPanel.getHeaderActions(getName());
+			return resultPanel.getHeaderActions(getOwner());
 		}
 		return null;
 	}

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeViewerProvider.java

@@ -461,7 +461,7 @@ private void createActions() {
 		tool.addLocalAction(this, new CollapseAllDataAction(this));
 		tool.addLocalAction(this, new ToggleExpandCollapseDataAction(this));
 
-		cloneCodeViewerAction = new CloneCodeViewerAction(getName(), this);
+		cloneCodeViewerAction = new CloneCodeViewerAction(plugin.getName(), this);
 		addLocalAction(cloneCodeViewerAction);
 
 		DockingAction action = new GotoPreviousFunctionAction(tool, plugin.getName());
@@ -982,7 +982,7 @@ public void setView(AddressSetView view) {
 	@Override
 	public List<DockingActionIf> getPopupActions(Tool dt, ActionContext context) {
 		if (context.getComponentProvider() == this) {
-			return listingPanel.getHeaderActions(getName());
+			return listingPanel.getHeaderActions(getOwner());
 		}
 		return null;
 	}

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterComponentProvider.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@ public InterpreterComponentProvider(InterpreterPanelPlugin plugin,
 
 	private void createActions() {
 
-		DockingAction clearAction = new DockingAction("Clear Interpreter", getName()) {
+		DockingAction clearAction = new DockingAction("Clear Interpreter", getOwner()) {
 			@Override
 			public void actionPerformed(ActionContext context) {
 				clear();