use layer manager in Command

[anonymous]

The Command class should get the active layer from the layer manager. otherwise it does not seem possible to use the command in a test with JOSMTestRules, because "Main.main" is null.

package org.openstreetmap.josm.command:

    /**
     * Creates a new command in the context of the current edit layer, if any
     */
    public Command() {
        this.layer = Main.main == null ? null : Main.main.getEditLayer();
    }

[bastiK]

Could you give a bit more context, what is JOSMTestRules?

[Don-vip]

new class in unit tests to speed up/replace JOSMFixtures (part of Michael's work)

[michael2402]

JOSMTestRules sets up the test environment more fine-graned than JOSMFixture does.

The main Idea is that you do not need a whole JOSM instance to get a simple unit test running. This is only possible if we reduce dependencies, e.g. that Command depends on Main.

I would like to deprecate all Main.*Layer*() methods except for getLayerManager() and replace them in the existing source.

You can replace this line:

this.layer = Main.main == null ? null : Main.main.getEditLayer();

With this one:

this.layer = Main.getLayerManager().getEditLayer();

The MainLayerManager will handle the case of an empty layer list automatically.

[Don-vip]

In 10413/josm:

fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by Main.getLayerManager().get[Active|Edit]Layer() - gsoc-core