Changeset 2243 in josm for trunk/src/org

Timestamp:

2009-10-04T12:07:16+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3650: Double-click on items in history dialog should open history
fixed #3649: History dialog does not show moved nodes
fixed #3383: changeset tags in history dialog (partial fix, there's now a link to the server page for browsing changesets)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/HistoryNode.java (modified) (3 diffs)
• gui/dialogs/HistoryDialog.java (modified) (7 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/history/CoordinateInfoViewer.java (added)
• gui/history/CoordinateTableCellRenderer.java (deleted)
• gui/history/CoordinateTableColumnModel.java (deleted)
• gui/history/CoordinateViewer.java (deleted)
• gui/history/HistoryBrowser.java (modified) (5 diffs)
• gui/history/HistoryBrowserModel.java (modified) (7 diffs)
• gui/history/NodeListViewer.java (modified) (1 diff)
• gui/history/VersionInfoPanel.java (modified) (6 diffs)
• io/OsmHistoryReader.java (modified) (6 diffs)
• tools/UrlLabel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -4 +4 @@
 import java.util.Date;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 
@@ -14 +14 @@
  */
 public class HistoryNode extends HistoryOsmPrimitive {
-    private LatLon coor;
-    public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp,
-    double lat, double lon) {
+    /** the coordinates */
+
+    private LatLon coords;
+
+    public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp, LatLon coords) {
         super(id, version, visible, user, uid, changesetId, timestamp);
-        coor = new LatLon(lat, lon);
+        setCoords(coords);
     }
 
@@ -26 +28 @@
     }
 
-    public LatLon getCoordinate() {
-        return coor;
+    public LatLon getCoords() {
+        return coords;
+    }
+
+    public void setCoords(LatLon coords) {
+        this.coords = coords;
     }
 }

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

@@ -110 +110 @@
             }
         });
+        historyTable.addMouseListener(new ShowHistoryMouseAdapter());
 
         JScrollPane pane = new JScrollPane(historyTable);
@@ -138 +139 @@
         model.refresh();
     }
-
-    /**
-     * shows the {@see HistoryBrowserDialog} for a given {@see History}
-     *
-     * @param h the history. Must not be null.
-     * @exception IllegalArgumentException thrown, if h is null
-     */
-    protected void showHistory(History h) throws IllegalArgumentException {
-        if (h == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "h"));
-        if (HistoryBrowserDialogManager.getInstance().existsDialog(h.getId())) {
-            HistoryBrowserDialogManager.getInstance().show(h.getId());
-        } else {
-            HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
-            HistoryBrowserDialogManager.getInstance().show(h.getId(), dialog);
-        }
-    }
-
 
     /**
@@ -233 +216 @@
             }
             return ret;
+        }
+
+        public OsmPrimitive getPrimitive(int row) {
+            return data.get(row);
         }
     }
@@ -286 +273 @@
     }
 
+    class ShowHistoryMouseAdapter extends MouseAdapter {
+        @Override
+        public void mouseClicked(MouseEvent e) {
+            if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
+                int row = historyTable.rowAtPoint(e.getPoint());
+                new ShowHistoryAction().showHistory(Collections.singletonList(model.getPrimitive(row)));
+            }
+        }
+    }
+
     /**
      * The action for showing history information of the current history item.
@@ -307 +304 @@
         }
 
-        public void actionPerformed(ActionEvent e) {
-            int [] rows = historyTable.getSelectedRows();
-            if (rows == null || rows.length == 0) return;
-
-            final List<OsmPrimitive> selectedItems = model.getPrimitives(rows);
-            List<OsmPrimitive> toLoad = filterPrimitivesWithUnloadedHistory(selectedItems);
+        /**
+         * shows the {@see HistoryBrowserDialog} for a given {@see History}
+         *
+         * @param h the history. Must not be null.
+         * @exception IllegalArgumentException thrown, if h is null
+         */
+        protected void showHistory(History h) throws IllegalArgumentException {
+            if (h == null)
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "h"));
+            if (HistoryBrowserDialogManager.getInstance().existsDialog(h.getId())) {
+                HistoryBrowserDialogManager.getInstance().show(h.getId());
+            } else {
+                HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
+                HistoryBrowserDialogManager.getInstance().show(h.getId(), dialog);
+            }
+        }
+
+        public void showHistory(final List<OsmPrimitive> primitives) {
+            List<OsmPrimitive> toLoad = filterPrimitivesWithUnloadedHistory(primitives);
             if (!toLoad.isEmpty()) {
                 HistoryLoadTask task = new HistoryLoadTask();
-                task.add(selectedItems);
+                task.add(primitives);
                 Main.worker.submit(task);
             }
@@ -321 +331 @@
             Runnable r = new Runnable() {
                 public void run() {
-                    for (OsmPrimitive p : selectedItems) {
+                    for (OsmPrimitive p : primitives) {
                         History h = HistoryDataSet.getInstance().getHistory(p.getId());
                         if (h == null) {
@@ -333 +343 @@
         }
 
+        public void actionPerformed(ActionEvent e) {
+            int [] rows = historyTable.getSelectedRows();
+            if (rows == null || rows.length == 0) return;
+            showHistory(model.getPrimitives(rows));
+        }
+
         protected void updateEnabledState() {
             setEnabled(historyTable.getSelectedRowCount() > 0);

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

@@ -138 +138 @@
         });
 
-        buttonPanel.add(new SideButton(marktr("Reload"), "refresh", "SelectionList", tr("Refresh the selection list."),
-                new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                selectionChanged(Main.main.getCurrentDataSet().getSelected());
-            }
-        }));
-
         searchButton = new SideButton(marktr("Search"), "search", "SelectionList", tr("Search for objects."),
                 Main.main.menu.search);

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

@@ -13 +13 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.History;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 
 /**
  * HistoryBrowser is an UI component which displays history information about an {@see OsmPrimitive}.
- *
+ * 
  *
  */
@@ -25 +25 @@
     /** the model */
     private HistoryBrowserModel model;
-    private JTabbedPane dataPane;
+    private TagInfoViewer tagInfoViewer;
+    private NodeListViewer nodeListViewer;
+    private RelationMemberListViewer relationMemberListViewer;
+    private CoordinateInfoViewer coordinateInfoViewer;
+    private JTabbedPane tpViewers;
+
 
     /**
      * embedds table in a {@see JScrollPane}
-     *
+     * 
      * @param table the table
      * @return the {@see JScrollPane} with the embedded table
@@ -42 +47 @@
     /**
      * creates the table which shows the list of versions
-     *
+     * 
      * @return  the panel with the version table
      */
@@ -57 +62 @@
      * creates the panel which shows information about two different versions
      * of the same {@see OsmPrimitive}.
-     *
+     * 
      * @return the panel
      */
+    protected JPanel createVersionComparePanel() {
+        tpViewers = new JTabbedPane();
 
-    protected JPanel createVersionComparePanel() {
-        dataPane = new JTabbedPane();
-        dataPane.add(new TagInfoViewer(model));
-        dataPane.setTitleAt(0, tr("Tags"));
-
-        dataPane.add(new NodeListViewer(model));
-        dataPane.setTitleAt(1, tr("Nodes"));
-
-        dataPane.add(new RelationMemberListViewer(model));
-        dataPane.setTitleAt(2, tr("Members"));
-
-        dataPane.add(new CoordinateViewer(model));
-        dataPane.setTitleAt(3, tr("Coordinate"));
-
+        // create the viewers, but don't add them yet.
+        // see populate()
+        //
+        tagInfoViewer = new TagInfoViewer(model);
+        nodeListViewer = new NodeListViewer(model);
+        relationMemberListViewer = new RelationMemberListViewer(model);
+        coordinateInfoViewer = new CoordinateInfoViewer(model);
         JPanel pnl = new JPanel();
         pnl.setLayout(new BorderLayout());
-        pnl.add(dataPane, BorderLayout.CENTER);
+        pnl.add(tpViewers, BorderLayout.CENTER);
         return pnl;
     }
@@ -122 +122 @@
     /**
      * populates the browser with the history of a specific {@see OsmPrimitive}
-     *
+     * 
      * @param history the history
      */
     public void populate(History history) {
         model.setHistory(history);
-        OsmPrimitiveType type = history.getType();
-        if(type != null)
-        {
-            if(type == OsmPrimitiveType.NODE)
-            {
-                dataPane.setEnabledAt(1, false);
-                dataPane.setEnabledAt(2, false);
-            }
-            else if(type == OsmPrimitiveType.WAY)
-            {
-                dataPane.setEnabledAt(2, false);
-                dataPane.setEnabledAt(3, false);
-            }
-            else
-            {
-                dataPane.setEnabledAt(3, false);
-            }
+
+        tpViewers.add(tagInfoViewer);
+        tpViewers.setTitleAt(0, tr("Tags"));
+
+        if (history.getEarliest().getType().equals(OsmPrimitiveType.NODE)) {
+            tpViewers.add(coordinateInfoViewer);
+            tpViewers.setTitleAt(1, tr("Coordinates"));
+        } else if (history.getEarliest().getType().equals(OsmPrimitiveType.WAY)) {
+            tpViewers.add(nodeListViewer);
+            tpViewers.setTitleAt(1, tr("Nodes"));
+        } else if (history.getEarliest().getType().equals(OsmPrimitiveType.RELATION)) {
+            tpViewers.add(relationMemberListViewer);
+            tpViewers.setTitleAt(2, tr("Members"));
         }
+        revalidate();
     }
 
     /**
      * replies the {@see History} currently displayed by this browser
-     *
+     * 
      * @return the current history
      */

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

@@ -62 +62 @@
     private RelationMemberTableModel currentRelationMemberTableModel;
     private RelationMemberTableModel referenceRelationMemberTableModel;
-    private CoordinateTableModel currentCoordinateTableModel;
-    private CoordinateTableModel referenceCoordinateTableModel;
 
     public HistoryBrowserModel() {
@@ -73 +71 @@
         currentRelationMemberTableModel = new RelationMemberTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
         referenceRelationMemberTableModel = new RelationMemberTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
-        currentCoordinateTableModel = new CoordinateTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
-        referenceCoordinateTableModel = new CoordinateTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
     }
 
@@ -136 +132 @@
         currentRelationMemberTableModel.fireTableDataChanged();
         referenceRelationMemberTableModel.fireTableDataChanged();
-    }
-
-    protected void initCoordinateTableModels() {
-        currentCoordinateTableModel.fireTableDataChanged();
-        referenceCoordinateTableModel.fireTableDataChanged();
     }
 
@@ -181 +172 @@
         else if (pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
             return referenceRelationMemberTableModel;
-
-        // should not happen
-        return null;
-    }
-
-    public CoordinateTableModel getCoordinateTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException {
-        if (pointInTimeType == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType"));
-        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
-            return currentCoordinateTableModel;
-        else if (pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME))
-            return referenceCoordinateTableModel;
 
         // should not happen
@@ -213 +192 @@
         initNodeListTabeModels();
         initMemberListTableModels();
-        initCoordinateTableModels();
         setChanged();
         notifyObservers();
@@ -232 +210 @@
         initNodeListTabeModels();
         initMemberListTableModels();
-        initCoordinateTableModels();
         setChanged();
         notifyObservers();
@@ -610 +587 @@
         }
     }
-
-    /**
-     * The table model for the coordinates of the version at {@see PointInTimeType#REFERENCE_POINT_IN_TIME}
-     * or {@see PointInTimeType#CURRENT_POINT_IN_TIME}
-     *
-     */
-    public class CoordinateTableModel extends DefaultTableModel {
-
-        private LatLon currentCoor = null;
-        private LatLon referenceCoor = null;
-        private PointInTimeType pointInTimeType;
-
-        protected CoordinateTableModel(PointInTimeType type) {
-            pointInTimeType = type;
-        }
-
-        @Override
-        public int getRowCount() {
-            if (current != null && current instanceof HistoryNode)
-                currentCoor = ((HistoryNode)current).getCoordinate();
-            else
-                return 0;
-            if (reference != null && reference instanceof HistoryNode)
-                referenceCoor = ((HistoryNode)reference).getCoordinate();
-            return 2;
-        }
-
-        @Override
-        public Object getValueAt(int row, int column) {
-            if(currentCoor == null)
-                return null;
-            else if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
-                return row == 0 ? currentCoor.latToString(CoordinateFormat.getDefaultFormat())
-                : currentCoor.lonToString(CoordinateFormat.getDefaultFormat());
-            else
-                return row == 0 ? referenceCoor.latToString(CoordinateFormat.getDefaultFormat())
-                : referenceCoor.lonToString(CoordinateFormat.getDefaultFormat());
-        }
-
-        @Override
-        public boolean isCellEditable(int row, int column) {
-            return false;
-        }
-
-        public boolean hasSameValueAsOpposite(int row) {
-            if(currentCoor == null)
-                return false;
-            else if(row == 0)
-                return currentCoor.lat() == referenceCoor.lat();
-            return currentCoor.lon() == referenceCoor.lon();
-        }
-
-        public PointInTimeType getPointInTimeType() {
-            return pointInTimeType;
-        }
-
-        public boolean isCurrentPointInTime() {
-            return pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME);
-        }
-
-        public boolean isReferencePointInTime() {
-            return pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME);
-        }
-    }
 }

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

@@ -143 +143 @@
         }
     }
-
 }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.text.SimpleDateFormat;
 import java.util.Observable;
@@ -16 +16 @@
 import org.openstreetmap.josm.actions.AbstractInfoAction;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
-import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UrlLabel;
 
 /**
  * VersionInfoPanel is an UI component which displays the basic properties of a version
  * of a {@see OsmPrimitive}.
- *
+ * 
  */
 public class VersionInfoPanel extends JPanel implements Observer{
@@ -28 +28 @@
     private HistoryBrowserModel model;
     private JLabel lblInfo;
+    private UrlLabel lblUser;
+    private UrlLabel lblChangeset;
 
     protected void build() {
-        setLayout(new BorderLayout());
+        JPanel pnl1 = new JPanel();
+        pnl1.setLayout(new FlowLayout(FlowLayout.LEFT));
         lblInfo = new JLabel();
         lblInfo.setHorizontalAlignment(JLabel.LEFT);
-        add(lblInfo, BorderLayout.CENTER);
+        pnl1.add(lblInfo);
+
+        JPanel pnl2 = new JPanel();
+        pnl2.setLayout(new FlowLayout(FlowLayout.LEFT));
+        lblUser = new UrlLabel();
+        pnl2.add(new JLabel(tr("User")));
+        pnl2.add(lblUser);
+        pnl2.add(new JLabel(tr("Changeset")));
+        lblChangeset = new UrlLabel();
+        pnl2.add(lblChangeset);
+
+        setLayout(new GridBagLayout());
+        GridBagConstraints gc = new GridBagConstraints();
+        gc.anchor = GridBagConstraints.NORTHWEST;
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        add(pnl1, gc);
+        gc.gridy = 1;
+        add(pnl2, gc);
     }
 
@@ -46 +68 @@
         if (primitive == null)
             return "";
-        String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId();
         String text = tr(
-                "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by <strong>{2}</strong> in changeset <strong>{3}</strong></html>",
+                "<html>Version <strong>{0}</strong> created on <strong>{1}</strong>",
                 Long.toString(primitive.getVersion()),
-                new SimpleDateFormat().format(primitive.getTimestamp()),
-                primitive.getUser().replace("<", "&lt;").replace(">", "&gt;"),
-                primitive.getChangesetId()
+                new SimpleDateFormat().format(primitive.getTimestamp())
         );
         return text;
@@ -65 +84 @@
     /**
      * constructor
-     *
+     * 
      * @param model  the model (must not be null)
      * @param pointInTimeType the point in time this panel visualizes (must not be null)
@@ -86 +105 @@
     public void update(Observable o, Object arg) {
         lblInfo.setText(getInfoText());
+
+        String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + getPrimitive().getChangesetId();
+        lblChangeset.setUrl(url);
+        lblChangeset.setDescription(tr("{0}", getPrimitive().getChangesetId()));
+
+        url = AbstractInfoAction.getBaseUserUrl() + "/" + getPrimitive().getUser();
+        lblUser.setUrl(url);
+        lblUser.setDescription(tr("{0}", getPrimitive().getUser()));
     }
 }

trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

@@ -12 +12 @@
 import javax.xml.parsers.SAXParserFactory;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -80 +81 @@
         }
 
-        protected long getAttributeLong(Attributes attr, String name, long defaultValue) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                return defaultValue;
-            }
-            Long l = 0l;
-            try {
-                l = Long.parseLong(v);
-            } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
-            }
-            if (l < 0) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
-            }
-            return l;
-        }
-
-        protected int getMandatoryAttributeInt(Attributes attr, String name) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
-            }
-            Integer i = 0;
-            try {
-                i = Integer.parseInt(v);
-            } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''.", name, v));
-            }
-            if (i < 0) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''.", name, v));
-            }
-            return i;
-        }
-
-        protected double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
-            }
-            double d = 0.0;
+        protected Double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null) {
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
+            }
+            double d = 0;
             try {
                 d = Double.parseDouble(v);
@@ -125 +92 @@
                 throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''.", name, v));
             }
+            if (d < 0) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double (>=0). Got ''{1}''.", name, v));
+            }
             return d;
         }
@@ -133 +103 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            return v;
-        }
-
-        protected String getAttributeString(Attributes attr, String name, String defaultValue) {
-            String v = attr.getValue(name);
-            if (v == null)
-                v = defaultValue;
             return v;
         }
@@ -157 +120 @@
         protected  HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
             long id = getMandatoryAttributeLong(atts,"id");
-            long version = getMandatoryAttributeLong(atts, "version");
-            long changesetId = getMandatoryAttributeLong(atts, "changeset");
-            boolean visible = getMandatoryAttributeBoolean(atts, "visible");
-            long uid = getAttributeLong(atts, "uid", -1);
-            String user = getAttributeString(atts, "user", tr("<anonymous>"));
+            long version = getMandatoryAttributeLong(atts,"version");
+            long changesetId = getMandatoryAttributeLong(atts,"changeset");
+            boolean visible= getMandatoryAttributeBoolean(atts, "visible");
+            long uid = getMandatoryAttributeLong(atts, "uid");
+            String user = getMandatoryAttributeString(atts, "user");
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);
@@ -169 +132 @@
                 double lon = getMandatoryAttributeDouble(atts, "lon");
                 primitive = new HistoryNode(
-                        id,version,visible,user,uid,changesetId,timestamp,lat,lon
+                        id,version,visible,user,uid,changesetId,timestamp, new LatLon(lat,lon)
                 );
+
             } else if (type.equals(OsmPrimitiveType.WAY)) {
                 primitive = new HistoryWay(

trunk/src/org/openstreetmap/josm/tools/UrlLabel.java

@@ -12 +12 @@
 public class UrlLabel extends JEditorPane implements HyperlinkListener {
 
-    private final String url;
+    private String url = "";
+    private String description = "";
+
+    public UrlLabel() {
+        addHyperlinkListener(this);
+        setEditable(false);
+        setOpaque(false);
+    }
 
     public UrlLabel(String url) {
@@ -19 +26 @@
 
     public UrlLabel(String url, String description) {
-        this.url = url;
+        this();
+        setUrl(url);
+        setDescription(description);
+        refresh();
+    }
+
+    protected void refresh() {
         setContentType("text/html");
         setText("<html><a href=\""+url+"\">"+description+"</a></html>");
         setToolTipText(url);
-        setEditable(false);
-        setOpaque(false);
-        addHyperlinkListener(this);
     }
 
@@ -33 +43 @@
         }
     }
+
+    public void setUrl(String url) {
+        this.url = url == null ? "" : url;
+        refresh();
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null? "" : description;
+        refresh();
+    }
 }