Changeset 5673 in josm for trunk

Timestamp:

2013-01-26T18:24:57+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #4304 - Improve error fixing performance by calling DataSet.beginUpdate/endUpdate

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -572 +572 @@
             // do nothing
         }
+        
+        protected void fixError(TestError error) throws InterruptedException, InvocationTargetException {
+            if (error.isFixable()) {
+                final Command fixCommand = error.getFix();
+                if (fixCommand != null) {
+                    SwingUtilities.invokeAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            Main.main.undoRedo.addNoRedraw(fixCommand);
+                        }
+                    });
+                }
+                // It is wanted to ignore an error if it said fixable, even if fixCommand was null
+                // This is to fix #5764 and #5773: a delete command, for example, may be null if all concerned primitives have already been deleted
+                error.setIgnored(true);
+            }
+        }
 
         @Override
@@ -580 +597 @@
                 monitor.setTicksCount(testErrors.size());
                 int i=0;
-                for (TestError error: testErrors) {
-                    i++;
-                    monitor.subTask(tr("Fixing ({0}/{1}): ''{2}''", i, testErrors.size(),error.getMessage()));
-                    if (this.canceled)
-                        return;
-                    if (error.isFixable()) {
-                        final Command fixCommand = error.getFix();
-                        if (fixCommand != null) {
-                            SwingUtilities.invokeAndWait(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Main.main.undoRedo.addNoRedraw(fixCommand);
-                                }
-                            });
+                SwingUtilities.invokeAndWait(new Runnable() {
+                    @Override
+                    public void run() {
+                        Main.main.getCurrentDataSet().beginUpdate();
+                    }
+                });
+                try {
+                    for (TestError error: testErrors) {
+                        i++;
+                        monitor.subTask(tr("Fixing ({0}/{1}): ''{2}''", i, testErrors.size(),error.getMessage()));
+                        if (this.canceled)
+                            return;
+                        fixError(error);
+                        monitor.worked(1);
+                    }
+                } finally {
+                    SwingUtilities.invokeAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            Main.main.getCurrentDataSet().endUpdate();
                         }
-                        // It is wanted to ignore an error if it said fixable, even if fixCommand was null
-                        // This is to fix #5764 and #5773: a delete command, for example, may be null if all concerned primitives have already been deleted
-                        error.setIgnored(true);
-                    }
-                    monitor.worked(1);
+                    });
                 }
                 monitor.subTask(tr("Updating map ..."));