Changeset 10637 in josm for trunk

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• datatransfer/TagTransferable.java (added)
• datatransfer/data/TagTransferData.java (modified) (1 diff)
• history/HistoryBrowserModel.java (modified) (2 diffs)
• history/SelectionSynchronizer.java (modified) (3 diffs)
• history/TagInfoTransferHandler.java (added)
• history/TagInfoViewer.java (modified) (4 diffs)
• history/TagTableCellRenderer.java (modified) (4 diffs)
• history/TagTableColumnModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/datatransfer/data/TagTransferData.java

@@ -40 +40 @@
 
     /**
+     * Create a new {@link TagTransferData} object with the given tags.
+     * @param tags The tags.
+     * @since 10637
+     */
+    public TagTransferData(Map<String, String> tags) {
+        this.tags.putAll(tags);
+    }
+
+    /**
      * Gets all tags contained in this data.
      * @return The tags.

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

@@ -582 +582 @@
         @Override
         public Object getValueAt(int row, int column) {
+            return getKeyAt(row);
+        }
+
+        /**
+         * Get the key for the given row.
+         * @param row The row
+         * @return The key in that row.
+         * @since 10637
+         */
+        public String getKeyAt(int row) {
             return keys.get(row);
         }
@@ -637 +647 @@
         @Override
         public int getColumnCount() {
-            return 1;
+            return 2;
         }
     }

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

@@ -13 +13 @@
 
     private final Set<ListSelectionModel> participants;
+    private boolean preventRecursion = false;
 
     /**
@@ -32 +33 @@
     @Override
     public void valueChanged(ListSelectionEvent e) {
+        if (preventRecursion) {
+            return;
+        }
+        preventRecursion = true;
         DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource();
         int i = referenceModel.getMinSelectionIndex();
@@ -40 +45 @@
             model.setSelectionInterval(i, i);
         }
+        preventRecursion = false;
     }
 }

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());
     }
 }

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

@@ -17 +17 @@
  */
 public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
-    public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255);
+    /**
+     * The background color for a selected row that has the focus.
+     */
+    public static final Color BGCOLOR_SELECTED_FOCUS = new Color(0xff8faaff);
+    /**
+     * The background color for a selected row while the table is not focused.
+     */
+    public static final Color BGCOLOR_SELECTED = new Color(0xffafc2ff);
 
     /**
@@ -26 +33 @@
     }
 
-    protected void setBackgroundReadable(String key, HistoryBrowserModel.TagTableModel model, boolean isSelected, boolean isValue) {
+    protected void setBackgroundReadable(String key, HistoryBrowserModel.TagTableModel model, boolean isSelected, boolean hasFocus,
+            boolean isValue) {
         Color bgColor = UIManager.getColor("Table.background");
         if (!model.hasTag(key) && model.isCurrentPointInTime()
@@ -38 +46 @@
         }
         if (isSelected) {
-            bgColor = BGCOLOR_SELECTED;
+            if (hasFocus) {
+                bgColor = BGCOLOR_SELECTED_FOCUS;
+            } else {
+                bgColor = BGCOLOR_SELECTED;
+            }
         }
 
@@ -54 +66 @@
         HistoryBrowserModel.TagTableModel model = getTagTableModel(table);
 
-        switch(column) {
-        case 0:
-            // the name column
-            setText(model.hasTag(key) ? key : "");
-            setToolTipText(getText());
-            setBackgroundReadable(key, model, isSelected, false);
-            break;
-        case 1:
-            // the value column
-            setText(model.hasTag(key) ? model.getValue(key) : "");
-            setToolTipText(getText());
-            setBackgroundReadable(key, model, isSelected, true);
-            break;
-        default: // Do nothing
+        String text = "";
+        if (model.hasTag(key)) {
+            switch(column) {
+            case TagTableColumnModel.COLUMN_KEY:
+                // the name column
+                text = key;
+                break;
+            case TagTableColumnModel.COLUMN_VALUE:
+                // the value column
+                text = model.getValue(key);
+                break;
+            default: // Do nothing
+            }
         }
 
+        setText(text);
+        setToolTipText(text);
+        setBackgroundReadable(key, model, isSelected, table.hasFocus(), column == TagTableColumnModel.COLUMN_VALUE);
         return this;
     }

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

@@ -12 +12 @@
  */
 public class TagTableColumnModel extends DefaultTableColumnModel {
+    protected static final int COLUMN_KEY = 0;
+    protected static final int COLUMN_VALUE = 1;
 
     /**