Changeset 10053 in josm

Timestamp:

2016-03-26T22:47:13+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12628 - Ability to copy coordinates from History dialog

File:

• trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) (8 diffs)

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

@@ -13 +13 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
@@ -22 +23 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Pair;
@@ -189 +191 @@
     }
 
+    private static JosmTextArea newTextArea() {
+        JosmTextArea area = new JosmTextArea();
+        GuiHelper.setBackgroundReadable(area, Color.WHITE);
+        area.setEditable(false);
+        area.setOpaque(true);
+        area.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+        area.setFont(UIManager.getFont("Label.font"));
+        return area;
+    }
+
     private static class Updater {
         private final HistoryBrowserModel model;
@@ -220 +232 @@
             return Pair.create(node.getCoords(), oppositeNode.getCoords());
         }
-
     }
 
     /**
-     * A UI widgets which displays the Lan/Lon-coordinates of a
-     * {@link HistoryNode}.
-     *
+     * A UI widgets which displays the Lan/Lon-coordinates of a {@link HistoryNode}.
      */
     private static class LatLonViewer extends JPanel implements Observer {
 
-        private JLabel lblLat;
-        private JLabel lblLon;
+        private final JosmTextArea lblLat = newTextArea();
+        private final JosmTextArea lblLon = newTextArea();
         private final Updater updater;
         private final Color modifiedColor;
@@ -254 +263 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
-            add(lblLat = new JLabel(), gc);
-            GuiHelper.setBackgroundReadable(lblLat, Color.WHITE);
-            lblLat.setOpaque(true);
-            lblLat.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+            add(lblLat, gc);
 
             // --------
@@ -272 +278 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
-            add(lblLon = new JLabel(), gc);
-            GuiHelper.setBackgroundReadable(lblLon, Color.WHITE);
-            lblLon.setOpaque(true);
-            lblLon.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+            add(lblLon, gc);
         }
 
         /**
-         *
+         * Constrcuts a new {@code LatLonViewer}.
          * @param model a model
          * @param role the role for this viewer.
@@ -357 +360 @@
     private static class DistanceViewer extends JPanel implements Observer {
 
-        private JLabel lblDistance;
+        private final JosmTextArea lblDistance = newTextArea();
         private final Updater updater;
 
@@ -384 +387 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
-            add(lblDistance = new JLabel(), gc);
-            GuiHelper.setBackgroundReadable(lblDistance, Color.WHITE);
-            lblDistance.setOpaque(true);
-            lblDistance.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+            add(lblDistance, gc);
         }