diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java index 851c193f8ff..1876d47fc07 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/AbstractCommand.java @@ -16,8 +16,7 @@ */ public abstract class AbstractCommand implements Command { - // FIXME: rename this from "affectedDataverses" to "affectedDvObjects". It's confusing. - private final Map affectedDataverses; + private final Map affectedDvObjects; private final DataverseRequest request; static protected class DvNamePair { @@ -48,21 +47,21 @@ public AbstractCommand(DataverseRequest aRequest, DvObject anAffectedDvObject) { public AbstractCommand(DataverseRequest aRequest, DvNamePair dvp, DvNamePair... more) { request = aRequest; - affectedDataverses = new HashMap<>(); - affectedDataverses.put(dvp.name, dvp.dvObject); + affectedDvObjects = new HashMap<>(); + affectedDvObjects.put(dvp.name, dvp.dvObject); for (DvNamePair p : more) { - affectedDataverses.put(p.name, p.dvObject); + affectedDvObjects.put(p.name, p.dvObject); } } public AbstractCommand(DataverseRequest aRequest, Map someAffectedDvObjects) { request = aRequest; - affectedDataverses = someAffectedDvObjects; + affectedDvObjects = someAffectedDvObjects; } @Override public Map getAffectedDvObjects() { - return affectedDataverses; + return affectedDvObjects; } @Override @@ -86,7 +85,7 @@ protected User getUser() { @Override public String describe() { StringBuilder sb = new StringBuilder(); - for (Map.Entry ent : affectedDataverses.entrySet()) { + for (Map.Entry ent : affectedDvObjects.entrySet()) { DvObject value = ent.getValue(); sb.append(ent.getKey()).append(":"); sb.append((value != null) ? value.accept(DvObject.NameIdPrinter) : "");