Changeset 19294 in josm

Timestamp:

2025-01-28T12:28:11+01:00 (37 hours ago)

Author:

taylor.smock

Message:

Fix test broken by dependency updates

EqualsVerifier did not like having two fields with the same name for an object.

File:

• trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -25 +25 @@
 public class AddPrimitivesCommand extends Command {
 
-    private List<PrimitiveData> data;
+    private List<PrimitiveData> primitiveData;
     private Collection<PrimitiveData> toSelect;
     private List<PrimitiveData> preExistingData;
@@ -56 +56 @@
     private void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
         CheckParameterUtil.ensureParameterNotNull(data, "data");
-        this.data = new ArrayList<>(data);
+        this.primitiveData = new ArrayList<>(data);
         if (toSelect == data) {
-            this.toSelect = this.data;
+            this.toSelect = this.primitiveData;
         } else if (toSelect != null) {
             this.toSelect = new ArrayList<>(toSelect);
@@ -76 +76 @@
     private void executeRealCommand(DataSet ds) {
         if (createdPrimitives == null) { // first time execution
-            List<OsmPrimitive> newPrimitives = new ArrayList<>(data.size());
+            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitiveData.size());
             preExistingData = new ArrayList<>();
 
-            for (PrimitiveData pd : data) {
+            for (PrimitiveData pd : primitiveData) {
                 OsmPrimitive primitive = ds.getPrimitiveById(pd);
                 boolean created = primitive == null;
@@ -99 +99 @@
             for (int i = 0; i < newPrimitives.size(); i++) {
                 if (!(newPrimitives.get(i) instanceof Node)) {
-                    newPrimitives.get(i).load(data.get(i));
+                    newPrimitives.get(i).load(primitiveData.get(i));
                 }
             }
@@ -108 +108 @@
             for (OsmPrimitive osm : createdPrimitives) {
                 if (preExistingData.stream().anyMatch(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId()))) {
-                    Optional<PrimitiveData> o = data.stream()
+                    Optional<PrimitiveData> o = primitiveData.stream()
                             .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
                     o.ifPresent(osm::load);
@@ -121 +121 @@
         DataSet ds = getAffectedDataSet();
         if (createdPrimitives == null) {
-            createdPrimitives = new ArrayList<>(data.size());
-            for (PrimitiveData pd : data) {
+            createdPrimitives = new ArrayList<>(primitiveData.size());
+            for (PrimitiveData pd : primitiveData) {
                 OsmPrimitive p = ds.getPrimitiveById(pd);
                 createdPrimitives.add(p);
@@ -147 +147 @@
     @Override
     public String getDescriptionText() {
-        int size = data != null ? data.size() : createdPrimitives.size();
+        int size = primitiveData != null ? primitiveData.size() : createdPrimitives.size();
         return trn("Added {0} object", "Added {0} objects", size, size);
     }
@@ -162 +162 @@
             return createdPrimitives;
 
-        return data.stream()
+        return primitiveData.stream()
                 .map(d -> Objects.requireNonNull(getAffectedDataSet().getPrimitiveById(d), () -> "No primitive found for " + d))
                 .collect(Collectors.toSet());
@@ -169 +169 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), data, toSelect, preExistingData, createdPrimitives);
+        return Objects.hash(super.hashCode(), primitiveData, toSelect, preExistingData, createdPrimitives);
     }
 
@@ -178 +178 @@
         if (!super.equals(obj)) return false;
         AddPrimitivesCommand that = (AddPrimitivesCommand) obj;
-        return Objects.equals(data, that.data) &&
+        return Objects.equals(primitiveData, that.primitiveData) &&
                Objects.equals(toSelect, that.toSelect) &&
                Objects.equals(preExistingData, that.preExistingData) &&