Changeset 5495 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

Timestamp:

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

Author:

Don-vip

Message:

see #7906 - Remove ODbL/CT stuff

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified) (13 diffs)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -26 +25 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
@@ -32 +30 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumnModel;
 
 import org.openstreetmap.josm.Main;
@@ -46 +42 @@
 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;
@@ -64 +59 @@
     private SelectUsersPrimitivesAction selectionUsersPrimitivesAction;
     private ShowUserInfoAction showUserInfoAction;
-    private LoadRelicensingInformationAction loadRelicensingInformationAction;
 
     public UserListDialog() {
@@ -90 +84 @@
         userTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         userTable.addMouseListener(new DoubleClickAdapter());
-        TableColumnModel columnModel = userTable.getColumnModel();
-        columnModel.getColumn(3).setPreferredWidth(20);
-        columnModel.getColumn(3).setCellRenderer(new DefaultTableCellRenderer() {
-            @Override
-            public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-                // see http://download.oracle.com/javase/6/docs/api/javax/swing/table/DefaultTableCellRenderer.html#override
-                // for why we don't use the label directly
-                final JLabel renderLabel = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-                JLabel sourceLabel = (JLabel) value;
-                renderLabel.setIcon(sourceLabel.getIcon());
-                renderLabel.setText("");
-                renderLabel.setToolTipText(sourceLabel.getToolTipText());
-                return renderLabel;
-            }
-        });
 
         // -- select users primitives action
@@ -116 +95 @@
         userTable.getSelectionModel().addListSelectionListener(showUserInfoAction);
 
-        // -- load relicensing info action
-        loadRelicensingInformationAction = new LoadRelicensingInformationAction();
-
         createLayout(userTable, true, Arrays.asList(new SideButton[] {
             new SideButton(selectionUsersPrimitivesAction),
-            new SideButton(showUserInfoAction),
-            new SideButton(loadRelicensingInformationAction)
+            new SideButton(showUserInfoAction)
         }));
     }
@@ -162 +137 @@
     public void showDialog() {
         super.showDialog();
-        Main.worker.submit(new ContributorTermsUpdateRunnable());
         Layer layer = Main.main.getActiveLayer();
         if (layer instanceof OsmDataLayer) {
@@ -259 +233 @@
     }
 
-    /*
-     */
-    class LoadRelicensingInformationAction extends AbstractAction {
-
-        public LoadRelicensingInformationAction() {
-            super();
-            putValue(NAME, tr("Load CT"));
-            putValue(SHORT_DESCRIPTION, tr("Loads information about relicensing status from the server. Users having agreed to the new contributor terms will show a green check mark."));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            Main.worker.submit(new ContributorTermsUpdateRunnable());
-            Layer layer = Main.main.getActiveLayer();
-            if (layer instanceof OsmDataLayer) {
-                refresh(((OsmDataLayer)layer).data.getAllSelected());
-            }
-            setEnabled(false);
-        }
-    }
-
     class DoubleClickAdapter extends MouseAdapter {
         @Override
@@ -317 +269 @@
             return user.getName();
         }
-
-        public int getRelicensingStatus() {
-            if (user == null)
-                return User.STATUS_UNKNOWN;
-            return user.getRelicensingStatus();
-        }
     }
 
@@ -333 +279 @@
 
         public UserTableModel() {
-            setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%", tr("CT")});
+            setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%"});
             data = new ArrayList<UserInfo>();
         }
@@ -375 +321 @@
             case 1: /* count */ return info.count;
             case 2: /* percent */ return NumberFormat.getPercentInstance().format(info.percent);
-            case 3: /* relicensing status */ return getRelicensingStatusIcon(info.getRelicensingStatus());
             }
             return null;
@@ -412 +357 @@
         }
     }
-
-    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(tr("Auto-accepted"));
-            }
-            return greyCheckmark;
-        case User.STATUS_NOT_AGREED:
-            if (redX == null) {
-                redX = new JLabel(ImageProvider.get("misc", "red_x.png"));
-                redX.setToolTipText(tr("Declined"));
-            }
-            return redX;
-        default:
-            if (empty == null) {
-                empty = new JLabel("");
-                empty.setToolTipText(tr("Undecided"));
-            }
-        }
-        return empty; // Undecided or unknown?
-    }
 }