Changeset 5495 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2012-09-02T14:20:28+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
r5460 r5495 20 20 import org.openstreetmap.josm.gui.MapView; 21 21 import org.openstreetmap.josm.gui.layer.Layer; 22 import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable;23 22 import org.openstreetmap.josm.tools.BugReportExceptionHandler; 24 23 import org.openstreetmap.josm.tools.Predicate; … … 146 145 return; 147 146 } 148 149 Main.worker.submit(new ContributorTermsUpdateRunnable());150 147 151 148 Collection<OsmPrimitive> toLoad = Utils.filter(primitives, unloadedHistoryPredicate); -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r5440 r5495 10 10 import java.util.Observable; 11 11 12 import javax.swing.JTable; 12 13 import javax.swing.table.AbstractTableModel; 14 import javax.swing.table.TableModel; 13 15 14 16 import org.openstreetmap.josm.Main; … … 40 42 import org.openstreetmap.josm.gui.MapView; 41 43 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; 42 import org.openstreetmap.josm.gui.dialogs.UserListDialog;43 44 import org.openstreetmap.josm.gui.layer.Layer; 44 45 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 428 429 return isCurrentPointInTime(row); 429 430 case 3: { 430 User user = getPrimitive(row).getUser();431 int status;432 if (user == null) {433 status = User.STATUS_UNKNOWN;434 } else {435 status = user.getRelicensingStatus();436 }437 return UserListDialog.getRelicensingStatusIcon(status);438 }439 case 4: {440 431 HistoryOsmPrimitive p = getPrimitive(row); 441 432 if (p != null && p.getTimestamp() != null) … … 443 434 return null; 444 435 } 445 case 5: {436 case 4: { 446 437 HistoryOsmPrimitive p = getPrimitive(row); 447 438 if (p != null) { -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r5264 r5495 58 58 adjustColumnWidth(VersionTable.this, 3, 0); 59 59 adjustColumnWidth(VersionTable.this, 4, 0); 60 adjustColumnWidth(VersionTable.this, 5, 0);61 60 } 62 61 }); -
trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
r5440 r5495 39 39 col.setResizable(false); 40 40 addColumn(col); 41 // column 3 - CT state41 // column 3 - Date 42 42 col = new TableColumn(3); 43 /* translation note: short for "Contributor Terms" */44 col.setHeaderValue(tr("CT"));45 col.setCellRenderer(new VersionTable.LabelRenderer());46 col.setPreferredWidth(22);47 col.setResizable(false);48 addColumn(col);49 // column 4 - Date50 col = new TableColumn(4);51 43 col.setHeaderValue(tr("Date")); 52 44 col.setResizable(false); 53 45 addColumn(col); 54 // column 5- User55 col = new TableColumn( 5);46 // column 4 - User 47 col = new TableColumn(4); 56 48 col.setHeaderValue(tr("User")); 57 49 col.setResizable(false);
Note:
See TracChangeset
for help on using the changeset viewer.