Invert semantics of boolean variables that were only tested in invert…

…ed form.
kingjon3377 · Apr 12, 2024 · 5650311 · 5650311
1 parent 8d43f24
commit 5650311
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/model/src/main/java/changesets/operations/entity/ReplaceEntityChangeset.java b/model/src/main/java/changesets/operations/entity/ReplaceEntityChangeset.java
@@ -1,7 +1,6 @@
 package changesets.operations.entity;
 
 import changesets.Changeset;
-import changesets.ChangesetFailureException;
 import changesets.PreconditionFailureException;
 import common.entity.IEntity;
 import common.map.IMap;
@@ -28,15 +27,15 @@ public ReplaceEntityChangeset(final @NotNull IEntity toRemove, final @NotNull IE
 	}
 
 	private void checkPrecondition(final @NotNull IMap map) throws PreconditionFailureException {
-		boolean met = false;
+		boolean neverMet = true;
 		for (final IEntity item : map.getAllEntities()) {
 			if (item.equals(toRemove)) {
-				met = true;
+				neverMet = false;
 			} else if (Objects.equals(item.getId(), toAdd.getId())) {
 				throw new PreconditionFailureException("Cannot add entity with non-unique ID");
 			}
 		}
-		if (!met) {
+		if (neverMet) {
 			throw new PreconditionFailureException("Cannot remove entity if not present in the map");
 		}
 	}

diff --git a/model/src/main/java/changesets/operations/player/ReplacePlayerChangeset.java b/model/src/main/java/changesets/operations/player/ReplacePlayerChangeset.java
@@ -1,7 +1,6 @@
 package changesets.operations.player;
 
 import changesets.Changeset;
-import changesets.ChangesetFailureException;
 import changesets.PreconditionFailureException;
 import common.map.IMap;
 import common.map.IMutableMap;
@@ -28,15 +27,15 @@ public ReplacePlayerChangeset(final @NotNull Player toRemove, final @NotNull Pla
 
 	private void checkPrecondition(final @NotNull IMap map) throws PreconditionFailureException {
 		final IPlayerCollection players = map.getPlayers();
-		boolean met = false;
+		boolean neverMet = true;
 		for (final Player item : players) {
 			if (item.equals(toRemove)) {
-				met = true;
+				neverMet = false;
 			} else if (item.playerId() == toAdd.playerId()) {
 				throw new PreconditionFailureException("Cannot add player with non-unique ID");
 			}
 		}
-		if (!met) {
+		if (neverMet) {
 			throw new PreconditionFailureException("Cannot remove player if not present in the map");
 		}
 	}