Changeset 10373 in josm for trunk/src/org

Timestamp:

2016-06-14T19:26:16+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12949 - Use test rule instead of JOSMFixture to speed up tests (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• io/OsmApi.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -79 +79 @@
                     ? getWMSLayerInfo() : info;
             if (infoToAdd != null) {
-                Main.main.addLayer(ImageryLayer.create(infoToAdd));
+                Main.getLayerManager().addLayer(ImageryLayer.create(infoToAdd));
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -90 +90 @@
         if (api == null) {
             api = new OsmApi(serverUrl);
-            instances.put(serverUrl, api);
+            cacheInstance(api);
         }
         return api;
+    }
+
+    protected static void cacheInstance(OsmApi api) {
+        instances.put(api.getServerUrl(), api);
     }