Ticket #19532: 19532-not-parallel.patch

File 19532-not-parallel.patch, 1.6 KB (added by GerdP, 4 years ago)

run "Initializing internal boundaries data" in beforeInitializationTasks so that we have no concurrent thread

  • src/org/openstreetmap/josm/gui/MainInitialization.java

     
    8080                // help shortcut
    8181                MainApplication.registerActionShortcut(MainApplication.menu.help,
    8282                        Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT));
     83            }),
     84            new InitializationTask(tr("Initializing internal boundaries data"), () -> {
     85                Territories.initialize();
     86                if (Config.getPref().getBoolean("override.numbering.format", true)) {
     87                    I18n.initializeNumberingFormat();
     88                }
    8389            })
    8490        );
    8591    }
    … …  
    110116                        Logging.warn(Logging.getErrorMessage(Utils.getRootCause(e)));
    111117                    }
    112118                }),
    113             new InitializationTask(tr("Initializing internal boundaries data"), () -> {
    114                 Territories.initialize();
    115                 if (Config.getPref().getBoolean("override.numbering.format", true)) {
    116                     I18n.initializeNumberingFormat();
    117                 }
    118             }),
    119119            new InitializationTask(tr("Initializing validator"), OsmValidator::initialize),
    120120            new InitializationTask(tr("Initializing presets"), TaggingPresets::initialize),
    121121            new InitializationTask(tr("Initializing map styles"), MapPaintPreference::initialize),