Changes between Initial Version and Version 2 of Ticket #22817

Timestamp:

2023-03-26T15:29:27+02:00 (3 years ago)

Author:

gaben

Comment:

• src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

  112	112	public static boolean saveUnsavedModifications(Iterable<? extends Layer> selectedLayers, Reason reason) {
  113	113	if (!GraphicsEnvironment.isHeadless()) {
  114	114	SaveLayersDialog dialog = new SaveLayersDialog(MainApplication.getMainFrame());
  115		List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
  	115	List<AbstractModifiableLayer> layersWithUnsavedChanges = new ArrayList<>();
  116	116	for (Layer l: selectedLayers) {
  117	117	if (!(l instanceof AbstractModifiableLayer)) {
  118	118	continue;
  …	…
  121	121	if (odl.isModified() &&
  122	122	((!odl.isSavable() && !odl.isUploadable()) ||
  123	123	odl.requiresSaveToFile() ||
  124		(odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
  125		layersWithUnmodifiedChanges.add(odl);
  	124	odl.requiresUploadToServer())) {
  	125	layersWithUnsavedChanges.add(odl);
  126	126	}
  127	127	}
  128	128	dialog.prepareForSavingAndUpdatingLayers(reason);
  129		if (!layersWithUnmodifiedChanges.isEmpty()) {
  130		dialog.getModel().populate(layersWithUnmodifiedChanges);
  	129	if (!layersWithUnsavedChanges.isEmpty()) {
  	130	dialog.getModel().populate(layersWithUnsavedChanges);
  131	131	dialog.setVisible(true);
  132	132	switch(dialog.getUserAction()) {
  133	133	case PROCEED: return true;

The upload=never option is not affected as in that case the isUploadable() returns false anyway.

I renamed the layersWithUnmodifiedChanges local variable to something more meaningful because the current naming contradicts.

Also whoever commits, the !odl.isSavable() && !odl.isUploadable() seems suspicious. When does it happen?