Changeset 14326 in josm


Ignore:
Timestamp:
2018-10-14T00:31:10+02:00 (5 weeks ago)
Author:
Don-vip
Message:

fix #4535, fix #16780 - detect changesets closed on server side after 1 hour

Location:
trunk/src/org/openstreetmap/josm
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

    r14273 r14326  
    2323import org.openstreetmap.josm.gui.io.CloseChangesetTask;
    2424import org.openstreetmap.josm.io.ChangesetQuery;
     25import org.openstreetmap.josm.io.ChangesetUpdater;
    2526import org.openstreetmap.josm.io.NetworkManager;
    2627import org.openstreetmap.josm.io.OnlineResource;
     
    6263
    6364    protected void onPostDownloadOpenChangesets() {
     65        ChangesetUpdater.check();
    6466        List<Changeset> openChangesets = ChangesetCache.getInstance().getOpenChangesetsForCurrentUser();
    6567        if (openChangesets.isEmpty()) {
  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r14252 r14326  
    3131import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    3232import org.openstreetmap.josm.gui.util.GuiHelper;
     33import org.openstreetmap.josm.io.ChangesetUpdater;
    3334import org.openstreetmap.josm.io.UploadStrategySpecification;
    3435import org.openstreetmap.josm.spi.preferences.Config;
     
    242243            return;
    243244
     245        ChangesetUpdater.check();
     246
    244247        final UploadDialog dialog = UploadDialog.getUploadDialog();
    245248        dialog.setChangesetTags(layer.getDataSet());
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r14273 r14326  
    130130import org.openstreetmap.josm.io.CachedFile;
    131131import org.openstreetmap.josm.io.CertificateAmendment;
     132import org.openstreetmap.josm.io.ChangesetUpdater;
    132133import org.openstreetmap.josm.io.DefaultProxySelector;
    133134import org.openstreetmap.josm.io.FileWatcher;
     
    952953        }
    953954
     955        ChangesetUpdater.start();
     956
    954957        if (Config.getPref().getBoolean("debug.edt-checker.enable", Version.getInstance().isLocalBuild())) {
    955958            // Repaint manager is registered so late for a reason - there is lots of violation during startup process
  • trunk/src/org/openstreetmap/josm/gui/MainTermination.java

    r14153 r14326  
    99import org.openstreetmap.josm.data.Preferences;
    1010import org.openstreetmap.josm.data.cache.JCSCacheManager;
     11import org.openstreetmap.josm.io.ChangesetUpdater;
     12import org.openstreetmap.josm.io.MessageNotifier;
     13import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
    1114import org.openstreetmap.josm.tools.ImageProvider;
    1215import org.openstreetmap.josm.tools.Logging;
     
    2023    @Override
    2124    public void run() {
     25        ChangesetUpdater.stop();
     26        MessageNotifier.stop();
     27        RemoteControl.stop();
     28
    2229        try {
    2330            MainApplication.worker.shutdown();
  • trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

    r14121 r14326  
    102102            Logging.info(tr("{0} not available (offline mode)", tr("Message notifier")));
    103103        } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
    104             task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, TimeUnit.MINUTES.toSeconds(interval), TimeUnit.SECONDS);
     104            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval, TimeUnit.MINUTES);
    105105            Logging.info("Message notifier active (checks every "+interval+" minute"+(interval > 1 ? "s" : "")+')');
    106106        }
Note: See TracChangeset for help on using the changeset viewer.