Changeset 5081 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-03-14T18:16:14+01:00 (12 years ago)

Author:

simon04

Message:

fix #7168 - add "Select previous/next Gap" to relation editor as popup menu of the relation members

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -172 +172 @@
             getSelectionModel().addListSelectionListener(zoomToGap);
             popupMenu.add(zoomToGap);
+            popupMenu.addSeparator();
+            popupMenu.add(new SelectPreviousGapAction());
+            popupMenu.add(new SelectNextGapAction());
         }
         return popupMenu;
@@ -247 +250 @@
         public void layerRemoved(Layer oldLayer) {
             updateEnabledState();
+        }
+    }
+
+    private class SelectPreviousGapAction extends AbstractAction {
+
+        public SelectPreviousGapAction() {
+            putValue(NAME, tr("Select previous Gap"));
+            putValue(SHORT_DESCRIPTION, tr("Select the previous relation member which gives rise to a gap"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int i = getSelectedRow() - 1;
+            while (i >= 0 && getMemberTableModel().getWayConnection(i).linkPrev) {
+                i--;
+            }
+            if (i >= 0) {
+                getSelectionModel().setSelectionInterval(i, i);
+            }
+        }
+    }
+
+    private class SelectNextGapAction extends AbstractAction {
+
+        public SelectNextGapAction() {
+            putValue(NAME, tr("Select next Gap"));
+            putValue(SHORT_DESCRIPTION, tr("Select the next relation member which gives rise to a gap"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int i = getSelectedRow() + 1;
+            while (i < getRowCount() && getMemberTableModel().getWayConnection(i).linkNext) {
+                i++;
+            }
+            if (i < getRowCount()) {
+                getSelectionModel().setSelectionInterval(i, i);
+            }
         }
     }