Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 5495) @@ -4,16 +4,10 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.IOException; - import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicLong; import java.util.HashMap; import java.util.HashSet; import java.util.List; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.io.MirroredInputStream; +import java.util.concurrent.atomic.AtomicLong; + import org.openstreetmap.josm.tools.Utils; @@ -35,6 +29,4 @@ */ private static HashMap userMap = new HashMap(); - private static HashSet relicensingUsers = null; - private static HashSet nonRelicensingUsers = null; private final static User anonymous = createLocalUser(tr("")); @@ -119,100 +111,8 @@ } - public static void initRelicensingInformation() { - if (relicensingUsers == null) { - loadRelicensingInformation(false); - } - } - - public static void loadRelicensingInformation(boolean clean) { - relicensingUsers = new HashSet(); - nonRelicensingUsers = new HashSet(); - try { - MirroredInputStream stream = new MirroredInputStream( - Main.pref.get("url.licensechange", - "http://planet.openstreetmap.org/users_agreed/users_agreed.txt"), - clean ? 1 : 7200); - try { - InputStreamReader r; - r = new InputStreamReader(stream); - BufferedReader reader = new BufferedReader(r); - String line; - while ((line = reader.readLine()) != null) { - if (line.startsWith("#")) continue; - try { - Long id = new Long(Long.parseLong(line.trim())); - relicensingUsers.add(id); - } catch (java.lang.NumberFormatException ex) { - } - } - } - finally { - stream.close(); - } - } catch (IOException ex) { - } - - try { - MirroredInputStream stream = new MirroredInputStream( - Main.pref.get("url.licensechange_reject", - "http://planet.openstreetmap.org/users_agreed/users_disagreed.txt"), - clean ? 1 : 7200); - try { - InputStreamReader r; - r = new InputStreamReader(stream); - BufferedReader reader = new BufferedReader(r); - String line; - while ((line = reader.readLine()) != null) { - if (line.startsWith("#")) continue; - try { - Long id = new Long(Long.parseLong(line.trim())); - nonRelicensingUsers.add(id); - } catch (java.lang.NumberFormatException ex) { - } - } - } - finally { - stream.close(); - } - } catch (IOException ex) { - } - } - /** the user name */ private final HashSet names = new HashSet(); /** the user id */ private final long uid; - private int relicensingStatus = STATUS_UNKNOWN; - - public static final int STATUS_UNKNOWN = -1; - public static final int STATUS_UNDECIDED = 0; - public static final int STATUS_AGREED = 1; - public static final int STATUS_NOT_AGREED = 2; - public static final int STATUS_AUTO_AGREED = 3; - public static final int STATUS_ANONYMOUS = 4; - - /** - * Finds out this user's relicensing status and saves it for quicker - * access. - */ - public int getRelicensingStatus() { - if (relicensingStatus != STATUS_UNKNOWN) return relicensingStatus; - if (uid >= 286582) return (relicensingStatus = STATUS_AUTO_AGREED); - if (relicensingUsers == null) return STATUS_UNKNOWN; - Long id = new Long(uid); - if (relicensingUsers.contains(id)) return (relicensingStatus = STATUS_AGREED); - if (nonRelicensingUsers == null) return STATUS_UNKNOWN; - if (nonRelicensingUsers.contains(id)) return (relicensingStatus = STATUS_NOT_AGREED); - return STATUS_UNDECIDED; - } - - /** - * Sets this user's relicensing status. This can be used if relicensing - * information is available from another source so that directly looking - * at the users_agreed/users_not_agreed files it not required. - */ - public void setRelicensingStatus(int status) { - relicensingStatus = status; - } /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 5495) @@ -5,5 +5,4 @@ import static org.openstreetmap.josm.tools.I18n.trn; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -26,5 +25,4 @@ import javax.swing.AbstractAction; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -32,7 +30,5 @@ 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,5 +42,4 @@ 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,5 +59,4 @@ private SelectUsersPrimitivesAction selectionUsersPrimitivesAction; private ShowUserInfoAction showUserInfoAction; - private LoadRelicensingInformationAction loadRelicensingInformationAction; public UserListDialog() { @@ -90,19 +84,4 @@ 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,11 +95,7 @@ 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,5 +137,4 @@ public void showDialog() { super.showDialog(); - Main.worker.submit(new ContributorTermsUpdateRunnable()); Layer layer = Main.main.getActiveLayer(); if (layer instanceof OsmDataLayer) { @@ -259,26 +233,4 @@ } - /* - */ - 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,10 +269,4 @@ return user.getName(); } - - public int getRelicensingStatus() { - if (user == null) - return User.STATUS_UNKNOWN; - return user.getRelicensingStatus(); - } } @@ -333,5 +279,5 @@ public UserTableModel() { - setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%", tr("CT")}); + setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%"}); data = new ArrayList(); } @@ -375,5 +321,4 @@ 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,37 +357,3 @@ } } - - 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? - } } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 5495) @@ -50,5 +50,4 @@ import org.openstreetmap.josm.gui.history.HistoryLoadTask; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.progress.ContributorTermsUpdateRunnable; import org.openstreetmap.josm.tools.BugReportExceptionHandler; import org.openstreetmap.josm.tools.ImageProvider; @@ -264,5 +263,4 @@ public void showHistory(final Collection primitives) { - Main.worker.submit(new ContributorTermsUpdateRunnable()); List toLoad = filterPrimitivesWithUnloadedHistory(primitives); Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 5495) @@ -20,5 +20,4 @@ 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,6 +145,4 @@ return; } - - Main.worker.submit(new ContributorTermsUpdateRunnable()); Collection toLoad = Utils.filter(primitives, unloadedHistoryPredicate); Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 5495) @@ -10,5 +10,7 @@ import java.util.Observable; +import javax.swing.JTable; import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableModel; import org.openstreetmap.josm.Main; @@ -40,5 +42,4 @@ 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,14 +429,4 @@ 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,5 +434,5 @@ return null; } - case 5: { + case 4: { HistoryOsmPrimitive p = getPrimitive(row); if (p != null) { Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 5495) @@ -58,5 +58,4 @@ adjustColumnWidth(VersionTable.this, 3, 0); adjustColumnWidth(VersionTable.this, 4, 0); - adjustColumnWidth(VersionTable.this, 5, 0); } }); Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (revision 5494) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (revision 5495) @@ -39,19 +39,11 @@ 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); Index: trunk/src/org/openstreetmap/josm/gui/progress/ContributorTermsUpdateRunnable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/ContributorTermsUpdateRunnable.java (revision 5494) +++ (revision ) @@ -1,27 +1,0 @@ -package org.openstreetmap.josm.gui.progress; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import org.openstreetmap.josm.data.osm.User; -import org.openstreetmap.josm.gui.PleaseWaitRunnable; - -public class ContributorTermsUpdateRunnable extends PleaseWaitRunnable { - - public ContributorTermsUpdateRunnable() { - super(tr("Updating CT user information")); - } - - @Override - protected void cancel() { - } - - @Override - protected void realRun() { - progressMonitor.indeterminateSubTask(null); - User.initRelicensingInformation(); - } - - @Override - protected void finish() { - } -}