SORMAS-Foundation#2943 small refactoring

Author: [email protected]

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java

@@ -916,7 +916,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 		CaseDataDto originalCase = getInternalValue();
 		Date oldFollowUpUntil = originalCase.getFollowUpUntil();
 		Date oldQuarantineEnd = originalCase.getQuarantineTo();
-		if (adjustQuarantine(quarantineTo, newFollowUpUntil, oldFollowUpUntil)) {
+		if (shouldAdjustQuarantine(quarantineTo, newFollowUpUntil, oldFollowUpUntil)) {
 			VaadinUiUtil.showConfirmationPopup(
 				I18nProperties.getString(Strings.headingAdjustQuarantine),
 				new Label(I18nProperties.getString(Strings.confirmationAlsoAdjustQuarantine)),
@@ -928,7 +928,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 						quarantineChangedByFollowUpUntilChange = true;
 						quarantineTo.setValue(newFollowUpUntil);
 						if (oldQuarantineEnd != null) {
-							boolean quarantineExtended = newFollowUpUntil.after(oldQuarantineEnd);
+							boolean quarantineExtended = quarantineTo.getValue().after(oldQuarantineEnd);
 							quarantineExtendedCheckBox.setValue(quarantineExtended);
 							quarantineReducedCheckBox.setValue(!quarantineExtended);
 							setVisible(quarantineExtended, CaseDataDto.QUARANTINE_EXTENDED);
@@ -939,7 +939,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 		}
 	}
 
-	private boolean adjustQuarantine(DateField quarantineTo, Date newFollowUpUntil, Date oldFollowUpUntil) {
+	private boolean shouldAdjustQuarantine(DateField quarantineTo, Date newFollowUpUntil, Date oldFollowUpUntil) {
 		return newFollowUpUntil != null &&
 				(oldFollowUpUntil == null || newFollowUpUntil.after(oldFollowUpUntil)) &&
 				quarantineTo.getValue() != null && newFollowUpUntil.compareTo(quarantineTo.getValue()) != 0;

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java

@@ -660,7 +660,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 		ContactDto originalContact = getInternalValue();
 		Date oldFollowUpUntil = originalContact.getFollowUpUntil();
 		Date oldQuarantineEnd = originalContact.getQuarantineTo();
-		if (adjustQuarantine(quarantineTo, newFollowUpUntil, oldFollowUpUntil)) {
+		if (shouldAdjustQuarantine(quarantineTo, newFollowUpUntil, oldFollowUpUntil)) {
 			VaadinUiUtil.showConfirmationPopup(
 				I18nProperties.getString(Strings.headingAdjustQuarantine),
 				new Label(I18nProperties.getString(Strings.confirmationAlsoAdjustQuarantine)),
@@ -672,7 +672,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 						quarantineChangedByFollowUpUntilChange = true;
 						quarantineTo.setValue(newFollowUpUntil);
 						if (oldQuarantineEnd != null) {
-							boolean quarantineExtended = newFollowUpUntil.after(oldQuarantineEnd);
+							boolean quarantineExtended = quarantineTo.getValue().after(oldQuarantineEnd);
 							quarantineExtendedCheckBox.setValue(quarantineExtended);
 							quarantineReducedCheckBox.setValue(!quarantineExtended);
 							setVisible(quarantineExtended, ContactDto.QUARANTINE_EXTENDED);
@@ -683,7 +683,7 @@ private void onFollowUpUntilChanged(Property.ValueChangeEvent valueChangeEvent,
 		}
 	}
 
-	private boolean adjustQuarantine(DateField quarantineTo, Date newFollowUpUntil, Date oldFollowUpUntil) {
+	private boolean shouldAdjustQuarantine(DateField quarantineTo, Date newFollowUpUntil, Date oldFollowUpUntil) {
 		return newFollowUpUntil != null &&
 				(oldFollowUpUntil == null || newFollowUpUntil.after(oldFollowUpUntil)) &&
 				quarantineTo.getValue() != null && newFollowUpUntil.compareTo(quarantineTo.getValue()) != 0;