Merge remote-tracking branch 'origin/patch'

Ghidra/Features/GhidraServer/src/main/java/ghidra/server/UserManager.java

@@ -735,13 +735,14 @@ public class UserManager {
 			getDNLog().println(username + "; " + principal);
 		}
 		catch (IOException e) {
+			// ignore
 		}
 	}
 
 	/*
 	 * Regex: matches if the entire string is alpha, digit, ".", "-", "_", fwd or back slash.
 	 */
-	private static final Pattern VALID_USERNAME_REGEX = Pattern.compile("[a-zA-Z0-9.-_/\\\\]+");
+	private static final Pattern VALID_USERNAME_REGEX = Pattern.compile("[a-zA-Z0-9.\\-_/\\\\]+");
 
 	/**
 	 * Ensures a name only contains valid characters and meets length limitations.

Ghidra/Framework/Docking/src/main/java/docking/AbstractDockingTool.java

@@ -152,7 +152,7 @@ public abstract class AbstractDockingTool implements DockingTool {
 
 	@Override
 	public void showDialog(DialogComponentProvider dialogComponent) {
-		DockingWindowManager.showDialog(getToolFrame(), dialogComponent);
+		DockingWindowManager.showDialog(null, dialogComponent);
 	}
 
 	public JFrame getToolFrame() {

Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java

@@ -62,7 +62,7 @@ public class AboutDomainObjectUtils {
 		if (helpLocation != null) {
 			dialog.setHelpLocation(helpLocation);
 		}
-		tool.showDialog(dialog, (Component) null);
+		tool.showDialog(dialog);
 	}
 
 	private static void addInfo(JPanel panel, String name, String value) {

Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/FindCheckoutsDialog.java

@@ -128,7 +128,8 @@ public class FindCheckoutsDialog extends DialogComponentProvider {
 
 	@Override
 	public ActionContext getActionContext(MouseEvent event) {
-		return new ProjectDataActionContext(null, null, null, null, getFileList(), null, true);
+		return new ProjectDataActionContext(null, folder.getProjectData(), null, null,
+			getFileList(), null, true);
 	}
 
 	private class MyCellRenderer extends GTableCellRenderer {

Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlShowHistoryAction.java

@@ -75,7 +75,7 @@ public class VersionControlShowHistoryAction extends VersionControlAction {
 		}
 
 		VersionHistoryDialog dialog = new VersionHistoryDialog(domainFiles.get(0));
-		tool.showDialog(dialog, tool.getToolFrame());
+		tool.showDialog(dialog);
 	}
 
 }

Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/VersionControlSlowScreenShots.java

@@ -15,7 +15,7 @@
  */
 package help.screenshot;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 
@@ -58,9 +58,9 @@ public class VersionControlSlowScreenShots extends GhidraScreenShotGenerator {
 	public void tearDown() throws Exception {
 
 		// super.tearDown();  don't do this; use our tool instead
-
+		if (frontEnd != null) {
 			frontEnd.dispose();
-
+		}
 		showResults();
 	}
 

Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction1Test.java

@@ -27,6 +27,7 @@ import javax.swing.*;
 import org.junit.Assert;
 import org.junit.Test;
 
+import docking.ActionContext;
 import docking.DialogComponentProvider;
 import docking.action.DockingActionIf;
 import docking.widgets.table.*;
@@ -212,7 +213,8 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		waitForTasks();
 
 		// make some changes to check in
-		Program program = (Program) ((DomainFileNode) node).getDomainFile().getDomainObject(this,
+		Program program = (Program) ((DomainFileNode) node).getDomainFile()
+				.getDomainObject(this,
 					true, false, TaskMonitor.DUMMY);
 		editProgram(program, (p) -> {
 			SymbolTable symTable = p.getSymbolTable();
@@ -220,7 +222,8 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 				SourceType.USER_DEFINED);
 		});
 
-		program = (Program) ((DomainFileNode) xnode).getDomainFile().getDomainObject(this, true,
+		program = (Program) ((DomainFileNode) xnode).getDomainFile()
+				.getDomainObject(this, true,
 					false, TaskMonitor.DUMMY);
 		editProgram(program, (p) -> {
 			SymbolTable symTable = p.getSymbolTable();
@@ -250,7 +253,8 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		checkout(programNode);
 
 		Program program =
-			(Program) ((DomainFileNode) programNode).getDomainFile().getDomainObject(this, true,
+			(Program) ((DomainFileNode) programNode).getDomainFile()
+					.getDomainObject(this, true,
 						false, TaskMonitor.DUMMY);
 
 		createHistoryEntry(program, "Symbol1");
@@ -559,25 +563,17 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 		FindCheckoutsTableModel model = (FindCheckoutsTableModel) table.getModel();
 
 		assertEquals(2, model.getRowCount());
-
 		assertEquals(4, model.getColumnCount());
 
-		JButton checkInButton =
+		DockingActionIf undoCheckoutAction = getAction("UndoCheckOut");
-			findButtonByIcon(dialog, ResourceManager.loadImage("images/vcCheckIn.png"));
+		DockingActionIf checkInAction = getAction("CheckIn");
-
+		assertFalse(checkInAction.isEnabledForContext(dialog.getActionContext(null)));
-		assertNotNull(checkInButton);
+		assertFalse(undoCheckoutAction.isEnabledForContext(dialog.getActionContext(null)));
-
-		JButton undoCheckoutButton =
-			findButtonByIcon(dialog, ResourceManager.loadImage("images/vcUndoCheckOut.png"));
-		assertNotNull(undoCheckoutButton);
-
-		assertTrue(!checkInButton.isEnabled());
-		assertTrue(!undoCheckoutButton.isEnabled());
 
 		// make a selection in the table
 		selectInTable(table, node);
-		assertTrue(checkInButton.isEnabled());
+		assertFalse(checkInAction.isEnabledForContext(dialog.getActionContext(null)));
-		assertTrue(undoCheckoutButton.isEnabled());
+		assertTrue(undoCheckoutAction.isEnabledForContext(dialog.getActionContext(null)));
 
 		CheckoutInfo checkoutInfo = model.getRowObject(0);
 		DomainFile file = checkoutInfo.getFile();
@@ -611,11 +607,9 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 
 		selectInTable(table, node);
 
-		JButton undoCheckoutButton =
+		DockingActionIf undoCheckoutAction = getAction("UndoCheckOut");
-			findButtonByIcon(dialog, ResourceManager.loadImage("images/vcUndoCheckOut.png"));
+		assertTrue(undoCheckoutAction.isEnabledForContext(dialog.getActionContext(null)));
-		assertNotNull(undoCheckoutButton);
+		performAction(undoCheckoutAction);
-		assertTrue(undoCheckoutButton.isEnabled());
-		pressButton(undoCheckoutButton);
 
 		waitForBusyTable(table);
 		assertEquals(1, model.getRowCount());
@@ -651,11 +645,10 @@ public class VersionControlAction1Test extends AbstractVersionControlActionTest
 			selectionModel.setSelectionInterval(0, 1); // both rows
 		});
 
-		JButton undoCheckoutButton =
+		DockingActionIf undoCheckoutAction = getAction("UndoCheckOut");
-			findButtonByIcon(dialog, ResourceManager.loadImage("images/vcUndoCheckOut.png"));
+		ActionContext context = dialog.getActionContext(null);
-		assertNotNull(undoCheckoutButton);
+		assertTrue(undoCheckoutAction.isEnabledForContext(context));
-		assertTrue(undoCheckoutButton.isEnabled());
+		performAction(undoCheckoutAction, context, true);
-		pressButton(undoCheckoutButton);
 
 		waitForBusyTable(table);
 		assertEquals(0, model.getRowCount());

Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/datatree/VersionControlAction2Test.java

@@ -213,7 +213,8 @@ public class VersionControlAction2Test extends AbstractVersionControlActionTest
 		waitForSwing();
 		waitForTasks();
 
-		Program program = (Program) ((DomainFileNode) node).getDomainFile().getDomainObject(this,
+		Program program = (Program) ((DomainFileNode) node).getDomainFile()
+				.getDomainObject(this,
 					true, false, TaskMonitor.DUMMY);
 		int transactionID = program.startTransaction("test");
 		try {
@@ -410,7 +411,7 @@ public class VersionControlAction2Test extends AbstractVersionControlActionTest
 
 		assertNotNull(dialog);
 
-		final GTable table = findComponent(dialog.getComponent(), GTable.class);
+		GTable table = findComponent(dialog.getComponent(), GTable.class);
 		assertNotNull(table);
 		waitForBusyTable(table);
 
@@ -419,14 +420,11 @@ public class VersionControlAction2Test extends AbstractVersionControlActionTest
 
 		selectInTable(table, node);
 
-		JButton checkInButton =
+		DockingActionIf checkInAction = getAction("CheckIn");
-			findButtonByIcon(dialog, ResourceManager.loadImage("images/vcCheckIn.png"));
+		ActionContext context = dialog.getActionContext(null);
-
+		assertTrue(checkInAction.isEnabledForContext(context));
-		assertNotNull(checkInButton);
+		performAction(checkInAction, context, false);
-		assertTrue(checkInButton.isEnabled());
-		pressButton(checkInButton, false);
 		VersionControlDialog d = waitForDialogComponent(VersionControlDialog.class);
-		assertNotNull(d);
 
 		pressButtonByText(d, "Cancel");
 

Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java

@@ -117,7 +117,7 @@ public class ServerTestUtil {
 	private static class ShutdownHook extends Thread {
 		@Override
 		public void run() {
-			Msg.debug(ServerTestUtil.class, "\n\n\n\n\tSHUTDONW HOOK RUNNING");
+			Msg.debug(ServerTestUtil.class, "\n\n\n\n\tSHUTDOWN HOOK RUNNING");
 			disposeServer();
 		}
 	}