Changeset 2318 in josm for trunk

Timestamp:

2009-10-25T15:51:51+01:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3739: History dialog displays anonymous users as "User: ". Should be "User: <anonymous>" or similar
Added context-sensitive help to the HistoryBrowser

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/history/HistoryBrowserDialog.java (modified) (2 diffs)
• gui/history/VersionInfoPanel.java (modified) (3 diffs)
• tools/UrlLabel.java (modified) (1 diff)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
+import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 /**
@@ -71 +73 @@
         btn.setName("btn.close");
         pnl.add(btn);
+
+        btn = new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/History")));
+        btn.setName("btn.help");
+        pnl.add(btn);
         add(pnl, BorderLayout.SOUTH);
+
+        HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/History"));
 
         setSize(800, 500);

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

@@ -12 +12 @@
 import java.util.Observable;
 import java.util.Observer;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -26 +27 @@
  */
 public class VersionInfoPanel extends JPanel implements Observer{
+    static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName());
 
     private PointInTimeType pointInTimeType;
@@ -123 +125 @@
             lblUser.setUrl(null);
         }
-        lblUser.setDescription(getPrimitive().getUser());
+        String username = getPrimitive().getUser();
+        lblUser.setDescription(username);
     }
 }

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

@@ -48 +48 @@
     }
 
+    /**
+     * Sets the URL to be visited if the user clicks on this URL label. If null, the
+     * label turns into a normal label without hyperlink.
+     * 
+     * @param url the url. Can be null.
+     */
     public void setUrl(String url) {
-        this.url = url == null ? "" : url;
+        this.url = url;
         refresh();
     }
 
+    /**
+     * Sets the text part of the URL label. Defaults to the empty string if description is null.
+     * 
+     * @param description the description
+     */
     public void setDescription(String description) {
         this.description = description == null? "" : description;
+        this.description = this.description.replace("&", "&amp;").replace(">", "&gt;").replace("<", "&lt;");
         refresh();
     }