Changeset 7556 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

Timestamp:

2014-09-18T02:23:15+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #8262 - Relation editor: filter autocompletion of roles by relation type

File:

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

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

@@ -29 +29 @@
 import org.openstreetmap.josm.actions.ZoomToAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
@@ -50 +51 @@
      * constructor for relation member table
      *
-     * @param layer the data layer of the relation
+     * @param layer the data layer of the relation. Must not be null
+     * @param relation the relation. Can be null
      * @param model the table model
      */
-    public MemberTable(OsmDataLayer layer, MemberTableModel model) {
-        super(model, new MemberTableColumnModel(layer.data), model.getSelectionModel());
+    public MemberTable(OsmDataLayer layer, Relation relation, MemberTableModel model) {
+        super(model, new MemberTableColumnModel(layer.data, relation), model.getSelectionModel());
         setLayer(layer);
         model.addMemberModelListener(this);
@@ -157 +159 @@
      * <li>it jumps over cells in the first column</li> <li>it automatically add a new empty row
      * when the user leaves the last cell in the table</li></ul>
-     *
-     *
      */
     class SelectNextColumnCellAction extends AbstractAction {
@@ -191 +191 @@
      * Action to be run when the user navigates to the previous cell in the table, for instance by
      * pressing Shift-TAB
-     *
      */
     private class SelectPreviousColumnCellAction extends AbstractAction {