fixed font loading bugs and new release

Author: Jeffrey-Young

bin/comp110/Schedule.class

@@ -46,15 +46,8 @@ private void computeShiftLeads() {
 			for (int hour = 0; hour < m_week.getShifts()[day].length; hour++) {
 				Employee lead = null;
 				int leadRank = Integer.MAX_VALUE; //we want to find min
-				System.out.println("Day: " + day + " Hour: " + hour);
 				for (Employee e : m_week.getShift(day, hour)) {
 					int rank = m_leads.getRank(e);
-					if (e.getOnyen().equals("youngjt")) {
-						System.out.println("Jeffrey rank: " + rank);
-					}
-					if (e.getOnyen().equals("dunnac11")) {
-						System.out.println("Duncan rank: " + rank);
-					}
 					if (rank < leadRank) { //if this employee is a potential lead
 						// found a new min
 						lead = e;
@@ -63,7 +56,6 @@ private void computeShiftLeads() {
 				}
 				if (lead != null) {
 					m_week.getShift(day, hour).setLead(lead);
-					System.out.println("Lead: " + lead.getOnyen());
 				}
 			}
 		}

bin/tests/ParserTest.class

@@ -74,9 +74,9 @@ public GridPane writeSchedule(Schedule schedule) {
 		}
 
 		//Load the fonts
-		InputStream is = ScheduleStage.class.getResourceAsStream("segoeui.ttf");
+		InputStream is = getClass().getResourceAsStream("segoeui.ttf");
         Font font = Font.loadFont(is, 12.0);   
-		InputStream is2 = ScheduleStage.class.getResourceAsStream("segoeuibold.ttf");
+		InputStream is2 = getClass().getResourceAsStream("segoeuibold.ttf");
         Font boldFont = Font.loadFont(is2, 12.0);
 
 
@@ -98,7 +98,7 @@ public GridPane writeSchedule(Schedule schedule) {
 						scheduledEmployee.setFont(font);
 
 						//bold shift lead
-						if (_ui.getCurrentEmployee() != null && schedule.getWeek().getShift(day, hour).getLead() != null && shifts.get(day).get(hour).get(i).equals(schedule.getWeek().getShift(day, hour).getLead())) {
+						if (schedule.getWeek().getShift(day, hour).getLead() != null && shifts.get(day).get(hour).get(i).equals(schedule.getWeek().getShift(day, hour).getLead())) {
 							scheduledEmployee.setFont(boldFont);
 							//scheduledEmployee.setFont(Font.getDefault());
 						}

releases/ShiftOverflow_v0.3.1.jar

@@ -71,8 +71,7 @@ public SwapBox(UI ui) {
 	public void registerSwapListener(Button saveButton, SwapBox otherBox) {
 		_personListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
 			_swapEmployee = _ui.getSchedule().getStaff().getEmployeeByName(newValue.getText());
-      System.out.println(_swapEmployee);
-      System.out.println(otherBox.getSwapEmployee());
+
 			if (_swapEmployee != null && otherBox.getSwapEmployee() != null) {
 				saveButton.setDisable(false);
 			}

src/comp110/Schedule.java

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