Revert the last commit's change to ContentProviderImpl; it was not actually needed to fix the motivating bug.

Author: eirikbakke

ide/jumpto/src/org/netbeans/modules/jumpto/symbol/ContentProviderImpl.java

@@ -391,6 +391,8 @@ public void run() {
                     if (done || resultChanged) {
                         lastSize = newSize[0];
                         lastProvCount = newProvCount;
+                        model.remove(toRemove);
+                        model.add(toAdd);
                         attrCopier.checkWrongCase(toRemove, toAdd);
                         if ( isCanceled ) {
                             LOG.log(
@@ -403,17 +405,6 @@ public void run() {
                             Level.FINE,
                             "Worker for text {0} finished after {1} ms.", //NOI18N
                             new Object[]{text, System.currentTimeMillis() - createTime});
-                        /* NB: model.remove and model.add must happen inside
-                           the invokeLater runnable, guarded by !isCanceled,
-                           so that
-                           (a) the remove and add are a single EDT turn (no
-                               intervening repaint/keystroke between them),
-                               and
-                           (b) a Worker that was cancelled after
-                               getSymbolNames cannot mutate the live model
-                               one final time. The cancel flag is set from
-                               the EDT in setListModel, so checking it on
-                               the EDT here is race-free. */
                         SwingUtilities.invokeLater(() -> {
                             if (done) {
                                 final Pair<String, String> nameAndScope = Utils.splitNameAndScope(text);
@@ -427,8 +418,6 @@ public void run() {
                                         nameAndScope.second());
                             }
                             if (!isCanceled) {
-                                model.remove(toRemove);
-                                model.add(toAdd);
                                 enableOK(panel.setModel(model, done));
                             }
                         });