Changeset 10637 in josm for trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

Timestamp:

2016-07-25T20:56:38+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13050 - cannot copy from the object history view (patch by michael2402, modified) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.history;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 
 import javax.swing.JTable;
@@ -16 +19 @@
  */
 public class TagInfoViewer extends HistoryViewerPanel {
+    private static final class RepaintOnFocusChange implements FocusListener {
+        @Override
+        public void focusLost(FocusEvent e) {
+            repaintSelected(e);
+        }
+
+        @Override
+        public void focusGained(FocusEvent e) {
+            repaintSelected(e);
+        }
+
+        private static void repaintSelected(FocusEvent e) {
+            // we would only need the selected rows, but this is easier:
+            e.getComponent().repaint();
+        }
+    }
+
+    /**
+     * Constructs a new {@code TagInfoViewer}.
+     * @param model The history browsing model
+     */
+    public TagInfoViewer(HistoryBrowserModel model) {
+        super(model);
+    }
 
     @Override
@@ -24 +51 @@
         );
         table.setName("table.referencetagtable");
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
+        setUpDataTransfer(table);
         return table;
     }
@@ -36 +62 @@
         );
         table.setName("table.currenttagtable");
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
+        setUpDataTransfer(table);
         return table;
     }
 
-    /**
-     * Constructs a new {@code TagInfoViewer}.
-     * @param model The history browsing model
-     */
-    public TagInfoViewer(HistoryBrowserModel model) {
-        super(model);
+    private void setUpDataTransfer(JTable table) {
+        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
+        table.setTransferHandler(new TagInfoTransferHandler());
+        table.addFocusListener(new RepaintOnFocusChange());
     }
 }