Changeset 16187 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2020-03-21T21:27:36+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18962 - introduce DataSet.update to avoid repetitive begin/endUpdate statements

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -24 +24 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -256 +257 @@
     public DataSet(OsmPrimitive... osmPrimitives) {
         this();
-        beginUpdate();
-        try {
+        update(() -> {
             for (OsmPrimitive o : osmPrimitives) {
                 addPrimitive(o);
             }
-        } finally {
-            endUpdate();
-        }
+        });
     }
 
@@ -499 +497 @@
         Objects.requireNonNull(primitive, "primitive");
         checkModifiable();
-        beginUpdate();
-        try {
+        update(() -> {
             if (getPrimitiveById(primitive) != null)
                 throw new DataIntegrityProblemException(
@@ -511 +508 @@
             store.addPrimitive(primitive);
             firePrimitivesAdded(Collections.singletonList(primitive), false);
-        } finally {
-            endUpdate();
-        }
+        });
     }
 
@@ -528 +523 @@
     public void removePrimitive(PrimitiveId primitiveId) {
         checkModifiable();
-        beginUpdate();
-        try {
+        update(() -> {
             OsmPrimitive primitive = getPrimitiveByIdChecked(primitiveId);
             if (primitive == null)
@@ -535 +529 @@
             removePrimitiveImpl(primitive);
             firePrimitivesRemoved(Collections.singletonList(primitive), false);
-        } finally {
-            endUpdate();
-        }
+        });
     }
 
@@ -552 +544 @@
     void removePrimitive(OsmPrimitive primitive) {
         checkModifiable();
-        beginUpdate();
-        try {
+        update(() -> {
             removePrimitiveImpl(primitive);
             firePrimitivesRemoved(Collections.singletonList(primitive), false);
-        } finally {
-            endUpdate();
-        }
+        });
     }
 
@@ -804 +793 @@
     public Set<Way> unlinkNodeFromWays(Node node) {
         checkModifiable();
-        Set<Way> result = new HashSet<>();
-        beginUpdate();
-        try {
+        return update(() -> {
+            Set<Way> result = new HashSet<>();
             for (Way way : node.getParentWays()) {
                 List<Node> wayNodes = way.getNodes();
@@ -818 +806 @@
                 }
             }
-        } finally {
-            endUpdate();
-        }
-        return result;
+            return result;
+        });
     }
 
@@ -833 +819 @@
     public Set<Relation> unlinkPrimitiveFromRelations(OsmPrimitive primitive) {
         checkModifiable();
-        Set<Relation> result = new HashSet<>();
-        beginUpdate();
-        try {
+        return update(() -> {
+            Set<Relation> result = new HashSet<>();
             for (Relation relation : getRelations()) {
                 List<RelationMember> members = relation.getMembers();
@@ -854 +839 @@
                 }
             }
-        } finally {
-            endUpdate();
-        }
-        return result;
+            return result;
+        });
     }
 
@@ -869 +852 @@
     public Set<OsmPrimitive> unlinkReferencesToPrimitive(OsmPrimitive referencedPrimitive) {
         checkModifiable();
-        Set<OsmPrimitive> result = new HashSet<>();
-        beginUpdate();
-        try {
+        return update(() -> {
+            Set<OsmPrimitive> result = new HashSet<>();
             if (referencedPrimitive instanceof Node) {
                 result.addAll(unlinkNodeFromWays((Node) referencedPrimitive));
             }
             result.addAll(unlinkPrimitiveFromRelations(referencedPrimitive));
-        } finally {
-            endUpdate();
-        }
-        return result;
+            return result;
+        });
     }
 
@@ -979 +959 @@
     }
 
+    /**
+     * Performs the update runnable between {@link #beginUpdate()} / {@link #endUpdate()} calls.
+     * @param runnable update action
+     * @since 16187
+     */
+    public void update(Runnable runnable) {
+        beginUpdate();
+        try {
+            runnable.run();
+        } finally {
+            endUpdate();
+        }
+    }
+
+    /**
+     * Performs the update function between {@link #beginUpdate()} / {@link #endUpdate()} calls.
+     * @param function update function
+     * @param t function argument
+     * @param <T> argument type
+     * @param <R> result type
+     * @return function result
+     * @since 16187
+     */
+    public <T, R> R update(Function<T, R> function, T t) {
+        beginUpdate();
+        try {
+            return function.apply(t);
+        } finally {
+            endUpdate();
+        }
+    }
+
+    /**
+     * Performs the update supplier between {@link #beginUpdate()} / {@link #endUpdate()} calls.
+     * @param supplier update supplier
+     * @param <R> result type
+     * @return supplier result
+     * @since 16187
+     */
+    public <R> R update(Supplier<R> supplier) {
+        beginUpdate();
+        try {
+            return supplier.get();
+        } finally {
+            endUpdate();
+        }
+    }
+
     private void fireEventToListeners(AbstractDatasetChangedEvent event) {
         for (DataSetListener listener : listeners) {
@@ -1044 +1072 @@
      * Invalidates the internal cache of projected east/north coordinates.
      *
-     * This method can be invoked after the globally configured projection method
-     * changed.
+     * This method can be invoked after the globally configured projection method changed.
      */
     public void invalidateEastNorthCache() {
         if (ProjectionRegistry.getProjection() == null)
             return; // sanity check
-        beginUpdate();
-        try {
-            for (Node n : getNodes()) {
-                n.invalidateEastNorthCache();
-            }
-        } finally {
-            endUpdate();
-        }
+        update(() -> getNodes().forEach(Node::invalidateEastNorthCache));
     }
 
@@ -1064 +1084 @@
      */
     public void cleanupDeletedPrimitives() {
-        beginUpdate();
-        try {
+        update(() -> {
             Collection<OsmPrimitive> toCleanUp = getPrimitives(
                     primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
@@ -1076 +1095 @@
                 firePrimitivesRemoved(toCleanUp, false);
             }
-        } finally {
-            endUpdate();
-        }
+        });
     }
 
@@ -1091 +1108 @@
         //TODO: Report listeners that are still active (should be none)
         checkModifiable();
-        beginUpdate();
-        try {
+        update(() -> {
             clearSelection();
             for (OsmPrimitive primitive : allPrimitives) {
@@ -1099 +1115 @@
             store.clear();
             allPrimitives.clear();
-        } finally {
-            endUpdate();
-        }
+        });
     }