Changeset 5495 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2012-09-02T14:20:28+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7906 - Remove ODbL/CT stuff

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialogManager.java (modified) (2 diffs)
• HistoryBrowserModel.java (modified) (4 diffs)
• VersionTable.java (modified) (1 diff)
• VersionTableColumnModel.java (modified) (1 diff)

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

@@ -20 +20 @@
 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;
@@ -146 +145 @@
             return;
         }
-
-        Main.worker.submit(new ContributorTermsUpdateRunnable());
 
         Collection<OsmPrimitive> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);

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

@@ -10 +10 @@
 import java.util.Observable;
 
+import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableModel;
 
 import org.openstreetmap.josm.Main;
@@ -40 +42 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.dialogs.UserListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -428 +429 @@
                 return isCurrentPointInTime(row);
             case 3: {
-                    User user = getPrimitive(row).getUser();
-                    int status;
-                    if (user == null) {
-                        status = User.STATUS_UNKNOWN;
-                    } else {
-                        status = user.getRelicensingStatus();
-                    }
-                    return UserListDialog.getRelicensingStatusIcon(status);
-                }
-            case 4: {
                     HistoryOsmPrimitive p = getPrimitive(row);
                     if (p != null && p.getTimestamp() != null)
@@ -443 +434 @@
                     return null;
                 }
-            case 5: {
+            case 4: {
                     HistoryOsmPrimitive p = getPrimitive(row);
                     if (p != null) {

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

@@ -58 +58 @@
                 adjustColumnWidth(VersionTable.this, 3, 0);
                 adjustColumnWidth(VersionTable.this, 4, 0);
-                adjustColumnWidth(VersionTable.this, 5, 0);
             }
         });

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

@@ -39 +39 @@
         col.setResizable(false);
         addColumn(col);
-        // column 3 - CT state
+        // column 3 - Date
         col = new TableColumn(3);
-        /* translation note: short for "Contributor Terms" */
-        col.setHeaderValue(tr("CT"));
-        col.setCellRenderer(new VersionTable.LabelRenderer());
-        col.setPreferredWidth(22);
-        col.setResizable(false);
-        addColumn(col);
-        // column 4 - Date
-        col = new TableColumn(4);
         col.setHeaderValue(tr("Date"));
         col.setResizable(false);
         addColumn(col);
-        // column 5 - User
-        col = new TableColumn(5);
+        // column 4 - User
+        col = new TableColumn(4);
         col.setHeaderValue(tr("User"));
         col.setResizable(false);