clear white spaces and redundant code after review

SORMAS-Foundation · Oct 23, 2024 · 20e51a2 · 20e51a2
1 parent 8a02305
commit 20e51a2
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 158 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java
@@ -137,145 +137,145 @@ public void setPortHealthUser(boolean portHealthUser) {
 		this.portHealthUser = portHealthUser;
 	}
 
-    public JurisdictionLevel getJurisdictionLevel() {
-        return jurisdictionLevel;
-    }
-
-    public void setJurisdictionLevel(JurisdictionLevel jurisdictionLevel) {
-        this.jurisdictionLevel = jurisdictionLevel;
-    }
-
-    public Set<NotificationType> getEmailNotificationTypes() {
-        return emailNotificationTypes;
-    }
-
-    public void setEmailNotificationTypes(Set<NotificationType> emailNotificationTypes) {
-        this.emailNotificationTypes = emailNotificationTypes;
-    }
-
-    public Set<NotificationType> getSmsNotificationTypes() {
-        return smsNotificationTypes;
-    }
-
-    public void setSmsNotificationTypes(Set<NotificationType> smsNotificationTypes) {
-        this.smsNotificationTypes = smsNotificationTypes;
-    }
-
-    public UserRoleReferenceDto toReference() {
-        return new UserRoleReferenceDto(getUuid(), getCaption());
-    }
-
-    public static Set<UserRight> getUserRights(Collection<UserRoleDto> userRoles) {
-
-        return userRoles != null ? userRoles.stream().flatMap(role -> role.getUserRights().stream()).collect(Collectors.toSet()) : null;
-    }
-
-    public DefaultUserRole getLinkedDefaultUserRole() {
-        return linkedDefaultUserRole;
-    }
-
-    public void setLinkedDefaultUserRole(DefaultUserRole linkedDefaultUserRole) {
-        this.linkedDefaultUserRole = linkedDefaultUserRole;
-    }
-
-    public static JurisdictionLevel getJurisdictionLevel(Collection<UserRoleDto> roles) {
-
-        boolean laboratoryJurisdictionPresent = false;
-        for (UserRoleDto role : roles) {
-            final JurisdictionLevel jurisdictionLevel = role.getJurisdictionLevel();
-            if (roles.size() == 1 || (jurisdictionLevel != JurisdictionLevel.NONE && jurisdictionLevel != JurisdictionLevel.LABORATORY)) {
-                return jurisdictionLevel;
-            } else if (jurisdictionLevel == JurisdictionLevel.LABORATORY) {
-                laboratoryJurisdictionPresent = true;
-            }
-        }
-
-        return laboratoryJurisdictionPresent ? JurisdictionLevel.LABORATORY : JurisdictionLevel.NONE;
-    }
-
-    @JsonIgnore
-    public String i18nPrefix() {
-        return I18N_PREFIX;
-    }
-
-    @Transient
-    public NotificationTypes getNotificationTypes() {
-        return NotificationTypes.of(smsNotificationTypes, emailNotificationTypes);
-    }
-
-    @Transient
-    public void setNotificationTypes(NotificationTypes notificationTypes) {
-        this.smsNotificationTypes = notificationTypes.sms;
-        this.emailNotificationTypes = notificationTypes.email;
-    }
-
-    public boolean isRestrictAccessToAssignedEntities() {
-        return restrictAccessToAssignedEntities;
-    }
-
-    public void setRestrictAccessToAssignedEntities(boolean restrictAccessToAssignedEntities) {
-        this.restrictAccessToAssignedEntities = restrictAccessToAssignedEntities;
-    }
-
-    @Override
-    public String buildCaption() {
-        return caption;
-    }
-
-    @SuppressWarnings("serial")
-    public static class UserRoleValidationException extends ValidationException {
-
-        private final UserRoleDto checkedUserRole;
-        private final UserRoleDto forbiddenUserRole;
-
-        public UserRoleValidationException(UserRoleDto checkedUserRole, UserRoleDto forbiddenUserRole) {
-            super(
-                    checkedUserRole.getCaption() + " " + I18nProperties.getString(Strings.messageUserRoleCombination) + " "
-                            + forbiddenUserRole.getCaption());
-            this.checkedUserRole = checkedUserRole;
-            this.forbiddenUserRole = forbiddenUserRole;
-        }
-
-        public UserRoleDto getCheckedUserRole() {
-            return checkedUserRole;
-        }
-
-        public UserRoleDto getForbiddenUserRole() {
-            return forbiddenUserRole;
-        }
-    }
-
-    public static class NotificationTypes {
-
-        private final Set<NotificationType> sms;
-        private final Set<NotificationType> email;
-
-        private NotificationTypes(Set<NotificationType> sms, Set<NotificationType> email) {
-            this.sms = sms;
-            this.email = email;
-        }
-
-        public static NotificationTypes of(Set<NotificationType> sms, Set<NotificationType> email) {
-            return new NotificationTypes(sms, email);
-        }
-
-        public Set<NotificationType> getSms() {
-            return sms;
-        }
-
-        public Set<NotificationType> getEmail() {
-            return email;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof NotificationTypes)) {
-                return false;
-            }
-
-            NotificationTypes notificationTypes = (NotificationTypes) obj;
-
-            return sms.equals(notificationTypes.sms) && email.equals(notificationTypes.email);
-        }
-    }
+	public JurisdictionLevel getJurisdictionLevel() {
+		return jurisdictionLevel;
+	}
+
+	public void setJurisdictionLevel(JurisdictionLevel jurisdictionLevel) {
+		this.jurisdictionLevel = jurisdictionLevel;
+	}
+
+	public Set<NotificationType> getEmailNotificationTypes() {
+		return emailNotificationTypes;
+	}
+
+	public void setEmailNotificationTypes(Set<NotificationType> emailNotificationTypes) {
+		this.emailNotificationTypes = emailNotificationTypes;
+	}
+
+	public Set<NotificationType> getSmsNotificationTypes() {
+		return smsNotificationTypes;
+	}
+
+	public void setSmsNotificationTypes(Set<NotificationType> smsNotificationTypes) {
+		this.smsNotificationTypes = smsNotificationTypes;
+	}
+
+	public UserRoleReferenceDto toReference() {
+		return new UserRoleReferenceDto(getUuid(), getCaption());
+	}
+
+	public static Set<UserRight> getUserRights(Collection<UserRoleDto> userRoles) {
+
+		return userRoles != null ? userRoles.stream().flatMap(role -> role.getUserRights().stream()).collect(Collectors.toSet()) : null;
+	}
+
+	public DefaultUserRole getLinkedDefaultUserRole() {
+		return linkedDefaultUserRole;
+	}
+
+	public void setLinkedDefaultUserRole(DefaultUserRole linkedDefaultUserRole) {
+		this.linkedDefaultUserRole = linkedDefaultUserRole;
+	}
+
+	public static JurisdictionLevel getJurisdictionLevel(Collection<UserRoleDto> roles) {
+
+		boolean laboratoryJurisdictionPresent = false;
+		for (UserRoleDto role : roles) {
+			final JurisdictionLevel jurisdictionLevel = role.getJurisdictionLevel();
+			if (roles.size() == 1 || (jurisdictionLevel != JurisdictionLevel.NONE && jurisdictionLevel != JurisdictionLevel.LABORATORY)) {
+				return jurisdictionLevel;
+			} else if (jurisdictionLevel == JurisdictionLevel.LABORATORY) {
+				laboratoryJurisdictionPresent = true;
+			}
+		}
+
+		return laboratoryJurisdictionPresent ? JurisdictionLevel.LABORATORY : JurisdictionLevel.NONE;
+	}
+
+	@JsonIgnore
+	public String i18nPrefix() {
+		return I18N_PREFIX;
+	}
+
+	@Transient
+	public NotificationTypes getNotificationTypes() {
+		return NotificationTypes.of(smsNotificationTypes, emailNotificationTypes);
+	}
+
+	@Transient
+	public void setNotificationTypes(NotificationTypes notificationTypes) {
+		this.smsNotificationTypes = notificationTypes.sms;
+		this.emailNotificationTypes = notificationTypes.email;
+	}
+
+	public boolean isRestrictAccessToAssignedEntities() {
+		return restrictAccessToAssignedEntities;
+	}
+
+	public void setRestrictAccessToAssignedEntities(boolean restrictAccessToAssignedEntities) {
+		this.restrictAccessToAssignedEntities = restrictAccessToAssignedEntities;
+	}
+
+	@Override
+	public String buildCaption() {
+		return caption;
+	}
+
+	@SuppressWarnings("serial")
+	public static class UserRoleValidationException extends ValidationException {
+
+		private final UserRoleDto checkedUserRole;
+		private final UserRoleDto forbiddenUserRole;
+
+		public UserRoleValidationException(UserRoleDto checkedUserRole, UserRoleDto forbiddenUserRole) {
+			super(
+				checkedUserRole.getCaption() + " " + I18nProperties.getString(Strings.messageUserRoleCombination) + " "
+					+ forbiddenUserRole.getCaption());
+			this.checkedUserRole = checkedUserRole;
+			this.forbiddenUserRole = forbiddenUserRole;
+		}
+
+		public UserRoleDto getCheckedUserRole() {
+			return checkedUserRole;
+		}
+
+		public UserRoleDto getForbiddenUserRole() {
+			return forbiddenUserRole;
+		}
+	}
+
+	public static class NotificationTypes {
+
+		private final Set<NotificationType> sms;
+		private final Set<NotificationType> email;
+
+		private NotificationTypes(Set<NotificationType> sms, Set<NotificationType> email) {
+			this.sms = sms;
+			this.email = email;
+		}
+
+		public static NotificationTypes of(Set<NotificationType> sms, Set<NotificationType> email) {
+			return new NotificationTypes(sms, email);
+		}
+
+		public Set<NotificationType> getSms() {
+			return sms;
+		}
+
+		public Set<NotificationType> getEmail() {
+			return email;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (!(obj instanceof NotificationTypes)) {
+				return false;
+			}
+
+			NotificationTypes notificationTypes = (NotificationTypes) obj;
+
+			return sms.equals(notificationTypes.sms) && email.equals(notificationTypes.email);
+		}
+	}
 }
diff --git a/sormas-app/app/src/main/res/drawable/button_round_edges.xml b/sormas-app/app/src/main/res/drawable/button_round_edges.xml
diff --git a/sormas-app/app/src/main/res/drawable/ic_baseline_check_.xml b/sormas-app/app/src/main/res/drawable/ic_baseline_check_.xml