Changeset 14676 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-01-12T16:44:47+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17182 - restore contextual menu of history dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• gui/history/NodeListViewer.java (modified) (3 diffs)
• gui/history/VersionTable.java (modified) (2 diffs)
• gui/widgets/PopupMenuLauncher.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -178 +178 @@
      * If the bounding box has not been set (<code>min</code> or <code>max</code>
      * equal <code>null</code>) this method does not do anything.
+     *
+     * @since 14628
      */
     public void enlargeBoundingBoxLogarithmically() {

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

@@ -43 +43 @@
 public class NodeListViewer extends HistoryViewerPanel {
 
-    private final NodeListPopupMenu popupMenu = new NodeListPopupMenu();
-
     /**
      * Constructs a new {@code NodeListViewer}.
@@ -218 +216 @@
     class InternalPopupMenuLauncher extends PopupMenuLauncher {
         InternalPopupMenuLauncher() {
-            super(popupMenu);
+            super(new NodeListPopupMenu());
         }
 
@@ -224 +222 @@
         protected int checkTableSelection(JTable table, Point p) {
             int row = super.checkTableSelection(table, p);
-            popupMenu.prepare(primitiveIdAtRow((DiffTableModel) table.getModel(), row));
+            ((NodeListPopupMenu) menu).prepare(primitiveIdAtRow((DiffTableModel) table.getModel(), row));
             return row;
         }

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

@@ -14 +14 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.Objects;
 
 import javax.swing.DefaultCellEditor;
@@ -124 +125 @@
     final class MouseListener extends PopupMenuLauncher {
         private MouseListener() {
-            super(popupMenu);
+            super(Objects.requireNonNull(popupMenu));
         }
 

trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java

@@ -15 +15 @@
 import javax.swing.SwingUtilities;
 import javax.swing.tree.TreePath;
+
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -113 +115 @@
                 menu.show(component, evt.getX(), evt.getY());
             }
+        } else {
+            Logging.warn("Unable to display menu {0} - {1}", menu, evt);
         }
     }