Changeset 36320 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2024-08-21T22:51:45+02:00 (5 months ago)

Author:

taylor.smock

Message:

Use API types (HashSet -> Set for private methods)

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (5 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -16 +16 @@
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -474 +475 @@
      * @param toDelete The primitives that will be deleted
      */
-    private void checkObjectVersions(List<Command> cmds, HashSet<OsmPrimitive> conflicted, HashSet<OsmPrimitive> toDelete) {
+    private void checkObjectVersions(List<Command> cmds, Set<OsmPrimitive> conflicted, Set<OsmPrimitive> toDelete) {
         for (Iterator<ChangesetDataSetEntry> it = cds.iterator(); it.hasNext();) {
             ChangesetDataSetEntry entry = it.next();
@@ -518 +519 @@
      * @return {@code true} if the objects are not semantically the same
      */
-    private boolean checkObjectVersionsNotSemanticallySame(HashSet<OsmPrimitive> toDelete, HistoryOsmPrimitive hp, OsmPrimitive dp) {
+    private boolean checkObjectVersionsNotSemanticallySame(Set<OsmPrimitive> toDelete, HistoryOsmPrimitive hp, OsmPrimitive dp) {
         return hp.getVersion() != dp.getVersion()
                 && (hp.isVisible() || dp.isVisible()) &&
@@ -535 +536 @@
      * @param toDelete The primitives that will be deleted
      */
-    private void checkForDeletedReferrers(List<Command> cmds, HashSet<OsmPrimitive> conflicted, HashSet<OsmPrimitive> toDelete) {
+    private void checkForDeletedReferrers(List<Command> cmds, Set<OsmPrimitive> conflicted, Set<OsmPrimitive> toDelete) {
         List<OsmPrimitive> delSorted = toDelete.stream()
                 .filter(p -> !p.isDeleted())
@@ -565 +566 @@
      * @return {@code true} if we need to restart processing
      */
-    private boolean checkForDeletedReferrersPrimitive(List<Command> cmds, HashSet<OsmPrimitive> conflicted,
-                                                      HashSet<OsmPrimitive> toDelete, List<OsmPrimitive> delSorted,
+    private boolean checkForDeletedReferrersPrimitive(List<Command> cmds, Set<OsmPrimitive> conflicted,
+                                                      Set<OsmPrimitive> toDelete, List<OsmPrimitive> delSorted,
                                                       OsmPrimitive p, int i) {
         for (OsmPrimitive referrer : p.getReferrers()) {