Changeset 4601 in josm

Timestamp:

2011-11-20T18:08:10+01:00 (13 years ago)

Author:

bastiK

Message:

history panel: new column indicating CT status of the user

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/User.java (modified) (1 diff)
• gui/dialogs/UserListDialog.java (modified) (3 diffs)
• gui/history/HistoryBrowser.java (modified) (1 diff)
• gui/history/HistoryBrowserModel.java (modified) (8 diffs)
• gui/history/VersionTable.java (modified) (7 diffs)
• gui/history/VersionTableCellRenderer.java (deleted)
• gui/history/VersionTableColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/User.java

@@ -63 +63 @@
      * @param name the name
      */
-    public static User  createOsmUser(long uid, String name) {
+    public static User createOsmUser(long uid, String name) {
         User user = userMap.get(uid);
         if (user == null) {

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

@@ -330 +330 @@
     static class UserTableModel extends DefaultTableModel {
         private ArrayList<UserInfo> data;
-        private JLabel greenCheckmark;
-        private JLabel greyCheckmark;
-        private JLabel redX;
-        private JLabel empty;
 
         public UserTableModel() {
             setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%", tr("CT")});
             data = new ArrayList<UserInfo>();
-            greenCheckmark = new JLabel(ImageProvider.get("misc", "green_check.png"));
-            greenCheckmark.setToolTipText(tr("Accepted"));
-            greyCheckmark = new JLabel(ImageProvider.get("misc", "grey_check.png"));
-            greyCheckmark.setToolTipText("Auto-accepted");
-            redX = new JLabel(ImageProvider.get("misc", "red_x.png"));
-            redX.setToolTipText("Declined");
-            empty = new JLabel("");
-            empty.setToolTipText("Undecided");
         }
 
@@ -386 +374 @@
             case 1: /* count */ return info.count;
             case 2: /* percent */ return NumberFormat.getPercentInstance().format(info.percent);
-            case 3: /* relicensing status */
-                switch(info.getRelicensingStatus()) {
-                case User.STATUS_AGREED: return greenCheckmark;
-                case User.STATUS_AUTO_AGREED: return greyCheckmark;
-                case User.STATUS_NOT_AGREED: return redX;
-                default: return empty; // Undecided or unknown?
-                }
+            case 3: /* relicensing status */ return getRelicensingStatusIcon(info.getRelicensingStatus());
             }
             return null;
@@ -429 +411 @@
         }
     }
+
+    private static JLabel greenCheckmark;
+    private static JLabel greyCheckmark;
+    private static JLabel redX;
+    private static JLabel empty;
+
+    public static JLabel getRelicensingStatusIcon(int status) {
+        switch(status) {
+        case User.STATUS_AGREED:
+            if (greenCheckmark == null) {
+                greenCheckmark = new JLabel(ImageProvider.get("misc", "green_check.png"));
+                greenCheckmark.setToolTipText(tr("Accepted"));
+            }
+            return greenCheckmark;
+        case User.STATUS_AUTO_AGREED:
+            if (greyCheckmark == null) {
+                greyCheckmark = new JLabel(ImageProvider.get("misc", "grey_check.png"));
+                greyCheckmark.setToolTipText("Auto-accepted");
+            }
+            return greyCheckmark;
+        case User.STATUS_NOT_AGREED:
+            if (redX == null) {
+                redX = new JLabel(ImageProvider.get("misc", "red_x.png"));
+                redX.setToolTipText("Declined");
+            }
+            return redX;
+        default:
+            if (empty == null) {
+                empty = new JLabel("");
+                empty.setToolTipText("Undecided");
+            }
+        }
+        return empty; // Undecided or unknown?
+    }
 }

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

@@ -96 +96 @@
 
         pane.setOneTouchExpandable(true);
-        pane.setDividerLocation(200);
+        pane.setDividerLocation(300);
 
         Dimension minimumSize = new Dimension(100, 50);

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18 +19 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -36 +38 @@
 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;
@@ -412 +415 @@
             switch (column) {
             case 0:
+                return Long.toString(getPrimitive(row).getVersion());
+            case 1:
                 return isReferencePointInTime(row);
-            case 1:
+            case 2:
                 return isCurrentPointInTime(row);
-            case 2:
-                if(history == null)
+            case 3:
+                long uId = getPrimitive(row).getUid();
+                User user = User.getById(uId);
+                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)
+                        return new SimpleDateFormat().format(p.getTimestamp());
                     return null;
-                if (row < history.getNumVersions())
-                    return history.get(row);
-                if (row == history.getNumVersions())
-                    return latest;
-                return null;
+                }
+            case 5: {
+                    HistoryOsmPrimitive p = getPrimitive(row);
+                    if (p != null)
+                        return "<html>"+p.getUser() + " <font color=gray>(" + p.getUid() + ")</font></html>";
+                    return null;
+                }
             }
             return null;
@@ -431 +450 @@
             if (!((Boolean) aValue)) return;
             switch (column) {
-            case 0:
+            case 1:
                 setReferencePointInTime(row);
                 break;
-            case 1:
+            case 2:
                 setCurrentPointInTime(row);
                 break;
+            default:
+                return;
             }
             fireTableDataChanged();
@@ -443 +464 @@
         @Override
         public boolean isCellEditable(int row, int column) {
-            return column < 2;
+            return column >= 1 && column <= 2;
         }
 
@@ -491 +512 @@
 
         public HistoryOsmPrimitive getPrimitive(int row) {
+            if (history == null)
+                return null;
             return isLatest(row) ? latest : history.get(row);
         }
@@ -507 +530 @@
         @Override
         public int getColumnCount() {
-            return 3;
+            return 6;
         }
     }

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

@@ -5 +5 @@
 
 import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
@@ -16 +18 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JCheckBox;
+import javax.swing.JLabel;
 import javax.swing.JPopupMenu;
 import javax.swing.JRadioButton;
@@ -21 +24 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
+import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 import javax.swing.table.TableCellRenderer;
 
@@ -38 +43 @@
 
     protected void build() {
+        getTableHeader().setFont(getTableHeader().getFont().deriveFont(9f));
         setRowSelectionAllowed(false);
+        setShowGrid(false);
+        setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        setBackground(UIManager.getColor("Button.background"));
+        setIntercellSpacing(new Dimension(6, 0));
+        putClientProperty("terminateEditOnFocusLost", true);
         popupMenu = new VersionTablePopupMenu();
         addMouseListener(new PopupMenuTrigger());
+        getModel().addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                adjustColumnWidth(VersionTable.this, 0);
+                adjustColumnWidth(VersionTable.this, 4);
+                adjustColumnWidth(VersionTable.this, 5);
+            }
+        });
     }
 
@@ -47 +66 @@
         model.addObserver(this);
         build();
+    }
+
+    // some kind of hack to prevent the table from scrolling to the
+    // right when clicking on the cells
+    @Override
+    public void scrollRectToVisible(Rectangle aRect) {
+        super.scrollRectToVisible(new Rectangle(0, aRect.y, aRect.width, aRect.height));
     }
 
@@ -135 +161 @@
 
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
-            HistoryBrowserModel.VersionTableModel model = (HistoryBrowserModel.VersionTableModel)table.getModel();
             setSelected(value != null && (Boolean)value);
             setHorizontalAlignment(SwingConstants.CENTER);
@@ -169 +194 @@
         }
     }
+
+    public static class LabelRenderer implements TableCellRenderer {
+        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
+            return (Component) value;
+        }
+    }
+
+    public static class AlignedRenderer extends JLabel implements TableCellRenderer {
+        public AlignedRenderer(int hAlignment) {
+            setHorizontalAlignment(hAlignment);
+        }
+        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
+            String v = value.toString();
+            setText(v);
+            return this;
+        }
+    }
+
+    private static void adjustColumnWidth(JTable tbl, int col) {
+        int maxwidth = 0;
+
+        for (int row=0; row<tbl.getRowCount(); row++) {
+            TableCellRenderer tcr = tbl.getCellRenderer(row, col);
+            Object val = tbl.getValueAt(row, col);
+            Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
+            maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
+        }
+        TableCellRenderer tcr = tbl.getTableHeader().getDefaultRenderer();
+        Object val = tbl.getColumnModel().getColumn(col).getHeaderValue();
+        Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, -1, col);
+        maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
+
+        int spacing = tbl.getIntercellSpacing().width;
+        tbl.getColumnModel().getColumn(col).setPreferredWidth(maxwidth + spacing);
+    }
+
 }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
+
 /**
  * The {@see TableColumnModel} for the table with the list of versions
@@ -14 +16 @@
     protected void createColumns() {
         TableColumn col = null;
-        TableCellRenderer renderer = new VersionTableCellRenderer();
         VersionTable.RadioButtonRenderer bRenderer = new VersionTable.RadioButtonRenderer();
 
-        // column 0 - Reverence
+        // column 0 - Version
         col = new TableColumn(0);
+        /* translation note: 3 letter abbr. for "Version" */
+        col.setHeaderValue(tr("Ver"));
+        col.setCellRenderer(new VersionTable.AlignedRenderer(SwingConstants.CENTER));
+        col.setResizable(false);
+        addColumn(col);
+        // column 1 - Reverence
+        col = new TableColumn(1);
+        col.setHeaderValue(tr("A"));
         col.setCellRenderer(bRenderer);
         col.setCellEditor(new VersionTable.RadioButtonEditor());
-        col.setMaxWidth(1);
+        col.setMaxWidth(18);
         col.setResizable(false);
         addColumn(col);
-        // column 1 - Current
-        col = new TableColumn(1);
+        // column 2 - Current
+        col = new TableColumn(2);
+        col.setHeaderValue(tr("B"));
         col.setCellRenderer(bRenderer);
         col.setCellEditor(new VersionTable.RadioButtonEditor());
-        col.setMaxWidth(1);
+        col.setPreferredWidth(18);
         col.setResizable(false);
         addColumn(col);
-        // column 2 - Rest
-        col = new TableColumn(2);
-        col.setHeaderValue(tr("Version"));
-        col.setCellRenderer(renderer);
+        // column 3 - CT state
+        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);
+        col.setHeaderValue(tr("User"));
+        col.setResizable(false);
         addColumn(col);
     }