GT-3208 Corrected ability to cancel versioned file checkin/checkout.

Strip domain prefix from default user name if present.  Other minor
usability adjustments.

Author: ghidra1

Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/BlockStreamServer.java

@@ -314,7 +314,8 @@ public void run() {
 						": failed to read stream header");
 				}
 				else if (!(e instanceof EOFException)) { // silent on closed connection
-					log.error("file block stream failed from " + socket.getInetAddress(), e);
+					log.error("file block stream failed from " + socket.getInetAddress() + ": " +
+						e.getMessage());
 				}
 			}
 			finally {

Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteInputBlockStreamHandle.java

@@ -67,7 +67,7 @@ private class ClientInputBlockStream implements InputBlockStream {
 
 		@Override
 		public void close() throws IOException {
-			socket.getInputStream().close();
+			in.close();
 			socket.close();
 		}
 

Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteOutputBlockStreamHandle.java

@@ -60,8 +60,10 @@ private class ClientOutputBlockStream implements OutputBlockStream {
 
 		ClientOutputBlockStream(Socket socket) throws IOException {
 			this.socket = socket;
-			out = compressed ? new DeflaterOutputStream(socket.getOutputStream(),
-				new Deflater(Deflater.BEST_SPEED)) : socket.getOutputStream();
+			out = compressed
+					? new DeflaterOutputStream(socket.getOutputStream(),
+						new Deflater(Deflater.BEST_SPEED))
+					: socket.getOutputStream();
 		}
 
 		@Override
@@ -76,7 +78,8 @@ public int getBlockSize() {
 
 		@Override
 		public void close() throws IOException {
-			socket.getOutputStream().close();
+			out.close();
+			socket.close();
 		}
 
 		@Override

Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientUtil.java

@@ -175,7 +175,13 @@ public static void clearRepositoryAdapter(String host, int port) throws IOExcept
 	 * should be obtained from RepositoryServerAdapter.getUser
 	 */
 	public static String getUserName() {
-		return SystemUtilities.getUserName();
+		String name = SystemUtilities.getUserName();
+		// exclude domain prefix which may be included
+		int slashIndex = name.lastIndexOf('\\');
+		if (slashIndex >= 0) {
+			name = name.substring(slashIndex + 1);
+		}
+		return name;
 	}
 
 	/**

Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFileData.java

@@ -893,6 +893,11 @@ else if (versionedFolderItem instanceof DataFileItem) {
 			catch (InvalidNameException e) {
 				throw new AssertException("Unexpected error", e);
 			}
+			finally {
+				if (folderItem == null) {
+					versionedFolderItem.terminateCheckout(checkout.getCheckoutId(), false);
+				}
+			}
 			folderItem.setCheckout(checkout.getCheckoutId(), exclusive, checkoutVersion,
 				folderItem.getCurrentVersion());
 

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

@@ -194,10 +194,13 @@ private int showConfirmDeleteVersionedDialog(DomainFile file) {
 				.addOption("Yes")
 				.addOption("No")
 				.addCancel()
-				.addApplyToAllOption()
 				.setMessageType(OptionDialog.WARNING_MESSAGE)
 				;
 			//@formatter:on
+
+			if (getFileCount() > 1) {
+				versionedDialogBuilder.addApplyToAllOption();
+			}
 		}
 
 		String msg =
@@ -217,10 +220,13 @@ private void showCheckedOutVersionedDialog(DomainFile file) throws CancelledExce
 				new OptionDialogBuilder("Delete Not Allowed")
 				.addOption("OK")
 				.addCancel()
-				.addDontShowAgainOption()
 				.setMessageType(OptionDialog.ERROR_MESSAGE)
 				;
 			//@formatter:on
+
+			if (getFileCount() > 1) {
+				checkedOutDialogBuilder.addDontShowAgainOption();
+			}
 		}
 
 		String msg = "The file \"" + file.getName() +
@@ -240,9 +246,12 @@ private void showFileInUseDialog(DomainFile file) throws CancelledException {
 				.addOption("OK")
 				.setMessageType(OptionDialog.ERROR_MESSAGE)
 				.addCancel()
-				.addDontShowAgainOption()
 				;
 			//@formatter:on
+
+			if (getFileCount() > 1) {
+				fileInUseDialogBuilder.addDontShowAgainOption();
+			}
 		}
 
 		String msg =
@@ -263,10 +272,13 @@ private int showConfirmReadOnlyDialog(DomainFile file) {
 					.addOption("No")
 					.addCancel()
 					.setMessageType(OptionDialog.WARNING_MESSAGE)
-					.addApplyToAllOption()
 					.setDefaultButton("No")
 					;
 			//@formatter:on
+
+			if (getFileCount() > 1) {
+				readOnlyDialogBuilder.addApplyToAllOption();
+			}
 		}
 
 		String msg = "The file \"" + file.getName() +

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

@@ -28,7 +28,9 @@
 import ghidra.framework.main.datatree.UndoActionDialog;
 import ghidra.framework.model.DomainFile;
 import ghidra.framework.plugintool.Plugin;
+import ghidra.util.Msg;
 import ghidra.util.exception.CancelledException;
+import ghidra.util.exception.FileInUseException;
 import ghidra.util.task.Task;
 import ghidra.util.task.TaskMonitor;
 import resources.ResourceManager;
@@ -177,6 +179,10 @@ public void run(TaskMonitor monitor) {
 			catch (CancelledException e) {
 				tool.setStatusInfo("Undo check out was canceled");
 			}
+			catch (FileInUseException e) {
+				Msg.showError(this, null, "Action Failed",
+					"Unable to Undo Checkout while file(s) are open or in use");
+			}
 			catch (IOException e) {
 				ClientUtil.handleException(repository, e, "Undo Check Out", tool.getToolFrame());
 			}

Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/RepositoryTest.java

@@ -15,17 +15,16 @@
  */
 package ghidra.server;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import java.io.File;
 
 import org.junit.*;
 
+import ghidra.framework.client.ClientUtil;
 import ghidra.framework.remote.User;
 import ghidra.test.AbstractGhidraHeadedIntegrationTest;
 import ghidra.util.NamingUtilities;
-import ghidra.util.SystemUtilities;
 import ghidra.util.exception.UserAccessException;
 import utilities.util.FileUtilities;
 
@@ -41,7 +40,7 @@ public class RepositoryTest extends AbstractGhidraHeadedIntegrationTest {
 	@Before
 	public void setUp() throws Exception {
 
-		userName = SystemUtilities.getUserName();
+		userName = ClientUtil.getUserName();
 
 		File parent = createTempDirectory(getClass().getSimpleName());