affectedDvObjects is a better name for this field IQSS#4262

uit-no-old · Nov 15, 2017 · 633a19d · 633a19d
1 parent 9a3f4a3
commit 633a19d
Showing 1 changed file with 7 additions and 8 deletions.
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
@@ -16,8 +16,7 @@
  */
 public abstract class AbstractCommand<R> implements Command<R> {
 
-    // FIXME: rename this from "affectedDataverses" to "affectedDvObjects". It's confusing.
-    private final Map<String, DvObject> affectedDataverses;
+    private final Map<String, DvObject> 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<String, DvObject> someAffectedDvObjects) {
         request = aRequest;
-        affectedDataverses = someAffectedDvObjects;
+        affectedDvObjects = someAffectedDvObjects;
     }
 
     @Override
     public Map<String, DvObject> getAffectedDvObjects() {
-        return affectedDataverses;
+        return affectedDvObjects;
     }
 
     @Override
@@ -86,7 +85,7 @@ protected User getUser() {
     @Override
     public String describe() {
         StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, DvObject> ent : affectedDataverses.entrySet()) {
+        for (Map.Entry<String, DvObject> ent : affectedDvObjects.entrySet()) {
             DvObject value = ent.getValue();
             sb.append(ent.getKey()).append(":");
             sb.append((value != null) ? value.accept(DvObject.NameIdPrinter) : "<null>");