Changeset 11885 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2017-04-10T23:49:54+02:00 (7 years ago)

Author:

Don-vip

Message:

add basic unit tests for MergeLayerAction + improve javadoc, code cleanup

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (4 diffs)

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

@@ -44 +44 @@
 import org.openstreetmap.josm.actions.MergeLayerAction;
 import org.openstreetmap.josm.data.preferences.AbstractProperty;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
@@ -90 +89 @@
 
     /**
-     * Creates the instance of the dialog. It's connected to the map frame <code>mapFrame</code>
+     * Creates the instance of the dialog. It's connected to the layer manager
      *
-     * @param mapFrame the map frame
-     */
-    public static void createInstance(MapFrame mapFrame) {
+     * @param layerManager the layer manager
+     * @since 11885 (signature)
+     */
+    public static void createInstance(MainLayerManager layerManager) {
         if (instance != null)
             throw new IllegalStateException("Dialog was already created");
-        instance = new LayerListDialog(mapFrame);
+        instance = new LayerListDialog(layerManager);
     }
 
@@ -105 +105 @@
      * @return the instance of the dialog
      * @throws IllegalStateException if the dialog is not created yet
-     * @see #createInstance(MapFrame)
+     * @see #createInstance(MainLayerManager)
      */
     public static LayerListDialog getInstance() {
@@ -164 +164 @@
 
     /**
-     * Creates a layer list and attach it to the given mapView.
-     * @param mapFrame map frame
-     */
-    protected LayerListDialog(MapFrame mapFrame) {
-        this(mapFrame.mapView.getLayerManager());
-    }
-
-    /**
-     * Creates a layer list and attach it to the given mapView.
+     * Creates a layer list and attach it to the given layer manager.
      * @param layerManager The layer manager this list is for
      * @since 10467