+ SafetyLogic logging bug fixed: default oldOccupancyValue will be NULL if it was null while logging.

benedekh · benedekh · commit 81e94d2dc399 · 2017-10-10T18:12:58.000+02:00
diff --git a/src/java/components/safetylogic/hu.bme.mit.inf.modes3.components.safetylogic.systemlevel.event/src/main/java/hu/bme/mit/inf/safetylogic/event/TrainMovementEstimator.xtend b/src/java/components/safetylogic/hu.bme.mit.inf.modes3.components.safetylogic.systemlevel.event/src/main/java/hu/bme/mit/inf/safetylogic/event/TrainMovementEstimator.xtend
@@ -30,7 +30,11 @@ class TrainMovementEstimator implements ISegmentOccupancyChangeListener, INotifi
 	}
 
 	private def print(SegmentOccupancy value) {
-		if(value == SegmentOccupancy.FREE) 'FREE' else 'OCCUPIED'
+		switch(value){
+			case FREE: 'FREE'
+			case OCCUPIED: 'OCCUPIED'
+			default: 'NULL'
+		}
 	}
 
 	def synchronized checkFreedSections() {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@ class TrainMovementEstimator implements ISegmentOccupancyChangeListener, INotifi`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`private def print(SegmentOccupancy value) {`
`33`		`- if(value == SegmentOccupancy.FREE) 'FREE' else 'OCCUPIED'`
	`33`	`+ switch(value){`
	`34`	`+ case FREE: 'FREE'`
	`35`	`+ case OCCUPIED: 'OCCUPIED'`
	`36`	`+ default: 'NULL'`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`def synchronized checkFreedSections() {`