- Timestamp:
- 2011-12-21T10:09:29+01:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r4601 r4674 46 46 import org.openstreetmap.josm.gui.layer.Layer; 47 47 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 48 import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable; 48 49 import org.openstreetmap.josm.tools.ImageProvider; 49 50 import org.openstreetmap.josm.tools.Shortcut; … … 161 162 public void showDialog() { 162 163 super.showDialog(); 163 User.initRelicensingInformation();164 Main.worker.submit(new ContributorTermsUpdateRunnable()); 164 165 Layer layer = Main.main.getActiveLayer(); 165 166 if (layer instanceof OsmDataLayer) { … … 271 272 @Override 272 273 public void actionPerformed(ActionEvent e) { 273 User.loadRelicensingInformation(true);274 Main.worker.submit(new ContributorTermsUpdateRunnable()); 274 275 Layer layer = Main.main.getActiveLayer(); 275 276 if (layer instanceof OsmDataLayer) { … … 428 429 if (greyCheckmark == null) { 429 430 greyCheckmark = new JLabel(ImageProvider.get("misc", "grey_check.png")); 430 greyCheckmark.setToolTipText( "Auto-accepted");431 greyCheckmark.setToolTipText(tr("Auto-accepted")); 431 432 } 432 433 return greyCheckmark; … … 434 435 if (redX == null) { 435 436 redX = new JLabel(ImageProvider.get("misc", "red_x.png")); 436 redX.setToolTipText( "Declined");437 redX.setToolTipText(tr("Declined")); 437 438 } 438 439 return redX; … … 440 441 if (empty == null) { 441 442 empty = new JLabel(""); 442 empty.setToolTipText( "Undecided");443 empty.setToolTipText(tr("Undecided")); 443 444 } 444 445 } -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
r4583 r4674 19 19 import org.openstreetmap.josm.gui.MapView; 20 20 import org.openstreetmap.josm.gui.layer.Layer; 21 import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable; 21 22 import org.openstreetmap.josm.tools.BugReportExceptionHandler; 22 23 import org.openstreetmap.josm.tools.Predicate; … … 144 145 return; 145 146 } 147 148 Main.worker.submit(new ContributorTermsUpdateRunnable()); 149 146 150 Collection<OsmPrimitive> toLoad = Utils.filter(primitives, unloadedHistoryPredicate); 147 151 if (!toLoad.isEmpty()) {
Note:
See TracChangeset
for help on using the changeset viewer.