Changeset 4674 in josm for trunk

Timestamp:

2011-12-21T10:09:29+01:00 (12 years ago)

Author:

simon04

Message:

fix #7172 - CT isn't always loaded by the History window when looking at an items history

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/UserListDialog.java (modified) (6 diffs)
• history/HistoryBrowserDialogManager.java (modified) (2 diffs)
• progress/ContributorTermsUpdateRunnable.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -161 +162 @@
     public void showDialog() {
         super.showDialog();
-        User.initRelicensingInformation();
+        Main.worker.submit(new ContributorTermsUpdateRunnable());
         Layer layer = Main.main.getActiveLayer();
         if (layer instanceof OsmDataLayer) {
@@ -271 +272 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            User.loadRelicensingInformation(true);
+            Main.worker.submit(new ContributorTermsUpdateRunnable());
             Layer layer = Main.main.getActiveLayer();
             if (layer instanceof OsmDataLayer) {
@@ -428 +429 @@
             if (greyCheckmark == null) {
                 greyCheckmark = new JLabel(ImageProvider.get("misc", "grey_check.png"));
-                greyCheckmark.setToolTipText("Auto-accepted");
+                greyCheckmark.setToolTipText(tr("Auto-accepted"));
             }
             return greyCheckmark;
@@ -434 +435 @@
             if (redX == null) {
                 redX = new JLabel(ImageProvider.get("misc", "red_x.png"));
-                redX.setToolTipText("Declined");
+                redX.setToolTipText(tr("Declined"));
             }
             return redX;
@@ -440 +441 @@
             if (empty == null) {
                 empty = new JLabel("");
-                empty.setToolTipText("Undecided");
+                empty.setToolTipText(tr("Undecided"));
             }
         }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.Predicate;
@@ -144 +145 @@
                         return;
                 }
+
+        Main.worker.submit(new ContributorTermsUpdateRunnable());
+
                 Collection<OsmPrimitive> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
                 if (!toLoad.isEmpty()) {