Minor bug fixes and enhancements

pom.xml

@@ -2,7 +2,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>POINT85</groupId>
 <artifactId>SHIFT</artifactId>
-<version>1.0.0</version>
+<version>1.0.1</version>
 
 <properties>
 <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/org/point85/workschedule/Team.java

@@ -174,6 +174,12 @@ public ShiftInstance getShiftInstanceForDay(LocalDate day) throws Exception {
 		ShiftInstance instance = null;
 
 		Rotation shiftRotation = getRotation();
+
+		if (shiftRotation.getDuration().equals(Duration.ZERO)) {
+			// no instance for that day
+			return instance;
+		}
+
 		int dayInRotation = getDayInRotation(day);
 
 		// shift or off shift

src/main/java/org/point85/workschedule/WorkSchedule.java

@@ -45,9 +45,9 @@ of this software and associated documentation files (the "Software"), to deal
  * @author Kent Randall
  *
  */
-public class WorkSchedule extends Named {
+public class WorkSchedule extends Named implements Comparable<WorkSchedule> {
 	// name of resource bundle with translatable strings for exception messages
-	private static final String MESSAGES_BUNDLE_NAME = "Message";
+	private static final String MESSAGES_BUNDLE_NAME = "WorkScheduleMessage";
 
 	// resource bundle for exception messages
 	private static final ResourceBundle messages = ResourceBundle.getBundle(MESSAGES_BUNDLE_NAME, Locale.getDefault());
@@ -155,19 +155,19 @@ public List<ShiftInstance> getShiftInstancesForDay(LocalDate day) throws Excepti
 			if (instance == null) {
 				continue;
 			}
-			
+
 			// check to see if this is a non-working day
 			boolean addShift = true;
-			
+
 			LocalDate startDate = instance.getStartTime().toLocalDate();
-			
+
 			for (NonWorkingPeriod nonWorkingPeriod : nonWorkingPeriods) {
 				if (nonWorkingPeriod.isInPeriod(startDate)) {
 					addShift = false;
 					break;
 				}
 			}
-			
+
 			if (addShift) {
 				workingShifts.add(instance);
 			}
@@ -324,7 +324,8 @@ public NonWorkingPeriod createNonWorkingPeriod(String name, String description,
 	 * Get total duration of rotation across all teams.
 	 * 
 	 * @return Duration of rotation
-	 * @throws Exception Exception
+	 * @throws Exception
+	 *             Exception
 	 */
 	public Duration getRotationDuration() throws Exception {
 		Duration sum = Duration.ZERO;
@@ -363,7 +364,7 @@ public Duration getRotationWorkingTime() {
 	 */
 	public Duration calculateWorkingTime(LocalDateTime from, LocalDateTime to) throws Exception {
 		Duration sum = Duration.ZERO;
-		
+
 		// now add up scheduled time by team
 		for (Team team : getTeams()) {
 			sum = sum.plus(team.calculateWorkingTime(from, to));
@@ -567,4 +568,12 @@ public Integer getVersion() {
 	public void setVersion(Integer version) {
 		this.version = version;
 	}
+
+	/**
+	 * Compare one work schedule to another
+	 */
+	@Override
+	public int compareTo(WorkSchedule other) {
+		return getName().compareTo(other.getName());
+	}
 }