Fix exception, merge worker stop code

Signed-off-by: Taylor Smock <[email protected]>
JOSM · Oct 10, 2022 · 5f8588b · 5f8588b
1 parent 6d099ba
commit 5f8588b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/layer/PointObjectLayer.java b/src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/layer/PointObjectLayer.java
@@ -457,8 +457,10 @@ public synchronized void destroy() {
         super.destroy();
         MainApplication.getMap().filterDialog.getFilterModel().removeTableModelListener(tableModelListener);
         List<? extends PointObjectLayer> layers = MainApplication.getLayerManager().getLayersOfType(this.getClass());
-        if (layers.isEmpty() || (layers.size() == 1 && this.equals(layers.get(0))))
+        if ((layers.isEmpty() || (layers.size() == 1 && this.equals(layers.get(0)))) &&
+            MapPaintStyles.getStyles().getStyleSources().contains(mapcss)) {
             MapPaintStyles.removeStyle(mapcss);
+        }
         VectorDataSet data = this.getData();
         data.removeHighlightUpdateListener(this);
         data.removeSelectionListener(this);

diff --git a/...nit/org/openstreetmap/josm/plugins/mapillary/testutils/annotations/GuiWorkersStopper.java b/...nit/org/openstreetmap/josm/plugins/mapillary/testutils/annotations/GuiWorkersStopper.java
@@ -19,25 +19,18 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @BasicPreferences
-@ExtendWith(GuiWorkersStopper.MapillaryNodeDownloader.class)
-@ExtendWith(GuiWorkersStopper.MapillarySequenceDownloader.class)
+@ExtendWith(GuiWorkersStopper.MapillaryDownloader.class)
 @MapillaryLayerAnnotation
 public @interface GuiWorkersStopper {
-    class MapillaryNodeDownloader implements AfterEachCallback {
+    class MapillaryDownloader implements AfterEachCallback {
         @Override
         public void afterEach(ExtensionContext context) {
             AtomicBoolean done = new AtomicBoolean();
             new org.openstreetmap.josm.plugins.mapillary.gui.workers.MapillaryNodesDownloader(nodes -> done.set(true), 1).execute();
-            Awaitility.await().atMost(Durations.ONE_SECOND).untilTrue(done);
-        }
-    }
-
-    class MapillarySequenceDownloader implements AfterEachCallback {
-        @Override
-        public void afterEach(ExtensionContext context) {
-            AtomicBoolean done = new AtomicBoolean();
+            Awaitility.await().atMost(Durations.FIVE_SECONDS).untilTrue(done);
+            done.set(false);
             new org.openstreetmap.josm.plugins.mapillary.gui.workers.MapillarySequenceDownloader("", chunks -> done.set(true)).execute();
-            Awaitility.await().atMost(Durations.ONE_SECOND).untilTrue(done);
+            Awaitility.await().atMost(Durations.FIVE_SECONDS).untilTrue(done);
         }
     }
 }