Changeset 14326 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-10-14T00:31:10+02:00 (6 years 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:

• actions/CloseChangesetAction.java (modified) (2 diffs)
• actions/UploadAction.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)
• gui/MainTermination.java (modified) (2 diffs)
• io/ChangesetUpdater.java (added)
• io/MessageNotifier.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.io.CloseChangesetTask;
 import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.ChangesetUpdater;
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -62 +63 @@
 
     protected void onPostDownloadOpenChangesets() {
+        ChangesetUpdater.check();
         List<Changeset> openChangesets = ChangesetCache.getInstance().getOpenChangesetsForCurrentUser();
         if (openChangesets.isEmpty()) {

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.ChangesetUpdater;
 import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -242 +243 @@
             return;
 
+        ChangesetUpdater.check();
+
         final UploadDialog dialog = UploadDialog.getUploadDialog();
         dialog.setChangesetTags(layer.getDataSet());

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -130 +130 @@
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.CertificateAmendment;
+import org.openstreetmap.josm.io.ChangesetUpdater;
 import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.FileWatcher;
@@ -952 +953 @@
         }
 
+        ChangesetUpdater.start();
+
         if (Config.getPref().getBoolean("debug.edt-checker.enable", Version.getInstance().isLocalBuild())) {
             // 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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
+import org.openstreetmap.josm.io.ChangesetUpdater;
+import org.openstreetmap.josm.io.MessageNotifier;
+import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -20 +23 @@
     @Override
     public void run() {
+        ChangesetUpdater.stop();
+        MessageNotifier.stop();
+        RemoteControl.stop();
+
         try {
             MainApplication.worker.shutdown();

trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

@@ -102 +102 @@
             Logging.info(tr("{0} not available (offline mode)", tr("Message notifier")));
         } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
-            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, TimeUnit.MINUTES.toSeconds(interval), TimeUnit.SECONDS);
+            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval, TimeUnit.MINUTES);
             Logging.info("Message notifier active (checks every "+interval+" minute"+(interval > 1 ? "s" : "")+')');
         }