Changeset 5050 in josm

Timestamp:

Mar 8, 2012 10:04:21 AM (15 months ago)

Author:

akks

Message:

UrlLabel class simplification by Zverik, better label layout in VersionInfoPanel (see #7450, #7326)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (1 diff)
• actions/Map_Rectifier_WMSmenuAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (6 diffs)
• gui/history/VersionInfoPanel.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (1 diff)
• tools/BugReportExceptionHandler.java (modified) (2 diffs)
• tools/UrlLabel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -71 +71 @@
         info.add(GBC.glue(0,10), GBC.eol());
         info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
-        info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(GBC.glue(0,5), GBC.eol());
         info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
-        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eol().fill(GBC.HORIZONTAL));
 
         JTextArea revision = new JTextArea();

trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java

@@ -137 +137 @@
             if(!s.url.equals("")) {
                 panel.add(serviceBtn, GBC.std());
-                panel.add(new UrlLabel(s.url, tr("Visit Homepage")), GBC.eol().anchor(GridBagConstraints.EAST));
+                panel.add(new UrlLabel(s.url, tr("Visit Homepage")), GBC.eol().anchor(GridBagConstraints.EAST), 2);
             } else {
                 panel.add(serviceBtn, GBC.eol().anchor(GridBagConstraints.WEST));

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Graphics2D;
+import java.awt.KeyboardFocusManager;
 import java.awt.MenuItem;
 import java.awt.Point;
@@ -39 +41 @@
 
 import java.util.TreeSet;
-import javax.swing.AbstractAction;
-import javax.swing.JOptionPane;
-
-import javax.swing.JPopupMenu;
-import javax.swing.Timer;
+import javax.swing.*;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -224 +222 @@
             return;
         if (event instanceof KeyEvent) {
+            Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+            Component wantedFocus = Main.map.mapView.getParent();
+            boolean foundMapViewAncestor=false;
+            while (focused!=null) {
+                if (focused==wantedFocus) {
+                    foundMapViewAncestor=true;
+                }
+                focused = focused.getParent();
+            }
+            // we accept only events that come from map or toggle dialogs, not from menu and dialogs
+            if (!foundMapViewAncestor) return;
             processKeyEvent((KeyEvent) event);
         } //  toggle angle snapping
@@ -238 +247 @@
     private Timer timer;
     void processKeyEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
+        if (!snappingShortcut.isEvent(e) && !getShortcut().isEvent(e))
             return;
 
@@ -261 +270 @@
 
     private void doKeyPressEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
-            return;
         snapHelper.setFixedMode();
         computeHelperLine();
@@ -268 +275 @@
     }
     private void doKeyReleaseEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e))
-            return;
         snapHelper.unFixOrTurnOff();
         computeHelperLine();

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
+import java.awt.*;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -48 +45 @@
 
         pnlUserAndChangeset = new JPanel();
-        pnlUserAndChangeset.setLayout(new FlowLayout(FlowLayout.LEFT));
-        lblUser = new UrlLabel();
+        pnlUserAndChangeset.setLayout(new GridLayout(2,2));
+        lblUser = new UrlLabel("", 2);
         pnlUserAndChangeset.add(new JLabel(tr("User:")));
         pnlUserAndChangeset.add(lblUser);
         pnlUserAndChangeset.add(new JLabel(tr("Changeset:")));
-        lblChangeset = new UrlLabel();
+        lblChangeset = new UrlLabel("", 2);
         pnlUserAndChangeset.add(lblChangeset);
 

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -839 +839 @@
                             tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")),
                             GBC.eol());
-            msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
+            msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces"),2), GBC.eop());
             if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"),
                     JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.OK_OPTION))

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -854 +854 @@
             }
             if (url != null) {
-                p.add(new UrlLabel(url, locale_text), GBC.eol().anchor(GBC.WEST));
+                p.add(new UrlLabel(url, locale_text, 2), GBC.eol().anchor(GBC.WEST));
             }
             return false;

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

@@ -126 +126 @@
                                     tr("You have encountered an error in JOSM. Before you file a bug report " +
                                             "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
-                            p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), GBC.eop().insets(8,0,0,0));
+                            p.add(new UrlLabel("http://josm.openstreetmap.de/#Download",2), GBC.eop().insets(8,0,0,0));
                             p.add(new JMultilineLabel(
                                     tr("You should also update your plugins. If neither of those help please " +
                                             "file a bug report in our bugtracker using this link:")), GBC.eol());
-                            p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
+                            p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...",2), GBC.eop().insets(8,0,0,0));
                             p.add(new JMultilineLabel(
                                     tr("There the error information provided below should already be " +
@@ -138 +138 @@
                                     tr("Alternatively, if that does not work you can manually fill in the information " +
                                             "below at this URL:")), GBC.eol());
-                            p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
+                            p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0));
                             if (Utils.copyToClipboard(text)) {
                                 p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.awt.Cursor;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import javax.swing.JEditorPane;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -12 +12 @@
  * Label that contains a clickable link.
  * @author Imi
+ * 5050: Simplifications by Zverikk included by akks
  */
-public class UrlLabel extends JEditorPane implements HyperlinkListener, MouseListener {
+public class UrlLabel extends JLabel implements MouseListener {
 
     private String url = "";
     private String description = "";
+    private int fontPlus;
 
     public UrlLabel() {
-        addHyperlinkListener(this);
         addMouseListener(this);
-        setEditable(false);
-        setOpaque(false);
+        setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     }
 
     public UrlLabel(String url) {
-        this (url, url);
+        this (url, url, 0);
+    }
+    
+    public UrlLabel(String url, int fontPlus) {
+        this (url, url, fontPlus);
     }
 
     public UrlLabel(String url, String description) {
+        this (url, url, 0);
+    }
+    
+    public UrlLabel(String url, String description, int fontPlus) {
         this();
         setUrl(url);
         setDescription(description);
+        this.fontPlus = fontPlus;
+        if (fontPlus!=0) setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus));
         refresh();
     }
 
     protected void refresh() {
-        setContentType("text/html");
         if (url != null) {
             setText("<html><a href=\""+url+"\">"+description+"</a></html>");
@@ -44 +53 @@
         }
         setToolTipText(String.format("<html>%s<br/>%s</html>",url, tr("Right click = copy to clipboard")));
-    }
-
-    public void hyperlinkUpdate(HyperlinkEvent e) {
-        if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-            OpenBrowser.displayUrl(url);
-        }
     }
 
@@ -75 +78 @@
 
     @Override
-    public void mouseClicked(MouseEvent e) {    }
+    public void mouseClicked(MouseEvent e) {
+        if( SwingUtilities.isLeftMouseButton(e) ) {
+            OpenBrowser.displayUrl(url);
+        } else if( SwingUtilities.isRightMouseButton(e) ) {
+            Utils.copyToClipboard(url);
+        }
+    }
     @Override
     public void mousePressed(MouseEvent e) {    }
@@ -82 +91 @@
     @Override
     public void mouseExited(MouseEvent e) {    }
-
     @Override
-    public void mouseReleased(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON3) {
-            Utils.copyToClipboard(url);
-        }
-    }
+    public void mouseReleased(MouseEvent e) {    }
 
 }