bug fixes in swap UI

Author: Jeffrey-Young

ShiftOverflow_v0.2.1.jar

@@ -319,7 +319,7 @@ private void saveButtonPressed(ActionEvent event) {
     // need to send to controller to save the current modified Employee
     // object
     // disable the save button so they can't save again until they make
-    // another chang
+    // another change
     _saveAvailabilityButton.setDisable(true);
     if (_ui.getCurrentEmployee() != null) {
       _controller.uiRequestSaveAvailability(_ui.getCurrentEmployee(),

src/ui/AvailabilityStage.java

@@ -130,7 +130,7 @@ private void performSwap(ActionEvent event) {
 		// show a warning that one of the employees is unavailable for the shift
 		// they are swapping into
 		_continueToSwap = true;
-		if (unavailableEmployee != null) {
+		if (unavailableEmployee != "") {
 			KarenStage dialogueBox = new KarenStage("Unavailable Employee", null, _ui);
 			Group root = new Group();
 			Scene scene = new Scene(root);
@@ -167,6 +167,12 @@ private void performSwap(ActionEvent event) {
 				dialogueBox.close();
 			});
 			Button no = new Button("No");
+			dialogueBox.setOnCloseRequest((event1) -> {
+				//assume hitting the close window button is like clicking no
+				// if not set the flag so we don't swap
+				_continueToSwap = false;
+				dialogueBox.close();
+			});
 			no.setOnAction((event1) -> {
 				// if not set the flag so we don't swap
 				_continueToSwap = false;

src/ui/PerformSwapStage.java

@@ -119,7 +119,7 @@ public void displayAvailable(Employee employee) {
 	  if (_availabilityStage != null){
 	    _availabilityStage.close();
 	  }
-		_availabilityStage = new AvailabilityStage("ShiftOverflow v0.2.0", _controller, this);
+		_availabilityStage = new AvailabilityStage("ShiftOverflow v0.2.1", _controller, this);
 		_availabilityStage.show();
 	}