[Patch] Save session: Sessions without data layer should always be savable as .jos

[skyper]

What steps will reproduce the problem?

1. Have some imagery layers and a data layer
2. Save session as
3. Deselect all data layer and press "enter"
4. Look at the file extension and its options in the next dialog

What is the expected result?

.jos should be default or at least available

What happens instead?

Only .joz available

Please provide any additional information below. Attach a screenshot if possible.

The file type needs to be chosen after the user's decision of layers

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2020-05-10 15:58:34 +0200 (Sun, 10 May 2020)
Revision:16402
Build-Date:2020-05-11 01:30:50
URL:https://josm.openstreetmap.de/svn/trunk

[Bjoeni]

• only consider exported layers for *.jos/*.joz file type determination

  src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

  @@ -116 +116 @@
               throw new UserCancelException();
           }
   
  -        boolean zipRequired = layers.stream().map(l -> exporters.get(l))
  +        // TODO: resolve dependencies for layers excluded by the user
  +        List<Layer> layersOut = layers.stream()
  +                .filter(layer -> exporters.get(layer) != null && exporters.get(layer).shallExport())
  +                .collect(Collectors.toList());
  +
  +        boolean zipRequired = layersOut.stream().map(l -> exporters.get(l))
                   .anyMatch(ex -> ex != null && ex.requiresZip());
   
           FileFilter joz = new ExtensionFileFilter("joz", "joz", tr("Session file (archive) (*.joz)"));
  @@ -158 +163 @@
               }
           }
   
  -        // TODO: resolve dependencies for layers excluded by the user
  -        List<Layer> layersOut = layers.stream()
  -                .filter(layer -> exporters.get(layer) != null && exporters.get(layer).shallExport())
  -                .collect(Collectors.toList());
  -
           Stream<Layer> layersToSaveStream = layersOut.stream()
                   .filter(layer -> layer.isSavable()
                           && layer instanceof AbstractModifiableLayer

Remaining issue: Sessions that include marker layers can still not be saved as *.jos, even if the GPX file is saved as a local file. See #21813

[stoecker]

Milestone renamed

[stoecker]

Join milestones

[Bjoeni]

Note: The patches #19219, #21813, #21922, #21923 all affect session handling. Whilst I don't think that they conflict, I only tested them all together.

It might make sense to only apply the all.patch that I attached on #21923

[taylor.smock]

In 18406/josm:

fix #19219: Sessions without data layer should be savable as .jos

• only consider exported layers for *.jos/*.joz file type determination (patch by Bjoeni, modified)