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

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

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (8 diffs)
• MemberRoleCellEditor.java (modified) (5 diffs)
• MemberTable.java (modified) (4 diffs)
• MemberTableColumnModel.java (modified) (2 diffs)

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

@@ -92 +92 @@
 /**
  * This dialog is for editing relations.
- *
+ * @since 343
  */
 public class GenericRelationEditor extends RelationEditor  {
@@ -172 +172 @@
         tagEditorPanel.getModel().ensureOneTag();
 
-        JSplitPane pane = buildSplitPane();
+        JSplitPane pane = buildSplitPane(relation);
         pane.setPreferredSize(new Dimension(100, 100));
 
@@ -293 +293 @@
      */
     protected JPanel buildMemberEditorPanel() {
-        final JPanel pnl = new JPanel();
-        pnl.setLayout(new GridBagLayout());
+        final JPanel pnl = new JPanel(new GridBagLayout());
         // setting up the member table
-        memberTable = new MemberTable(getLayer(),memberTableModel);
+        memberTable = new MemberTable(getLayer(), getRelation(), memberTableModel);
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
@@ -350 +349 @@
                         if (list != null) {
                             list.clear();
-                            getLayer().data.getAutoCompletionManager().populateWithMemberRoles(list);
+                            getLayer().data.getAutoCompletionManager().populateWithMemberRoles(list, getRelation());
                         }
                     }
@@ -454 +453 @@
      * @return the split panel
      */
-    protected JSplitPane buildSplitPane() {
+    protected JSplitPane buildSplitPane(Relation relation) {
         final JSplitPane pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
         pane.setTopComponent(buildTagEditorPanel());
@@ -1603 +1602 @@
 
     /**
-     * Creates a new relation with a copy of the current editor state
-     *
+     * Creates a new relation with a copy of the current editor state.
      */
     class DuplicateRelationAction extends AbstractAction {
@@ -1626 +1624 @@
 
     /**
-     * Action for editing the currently selected relation
-     *
-     *
+     * Action for editing the currently selected relation.
      */
     class EditAction extends AbstractAction implements ListSelectionListener {
@@ -1736 +1732 @@
             }
         }
-
     }
 

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -15 +16 @@
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
     private AutoCompletingTextField editor = null;
-    private DataSet ds;
+    private final DataSet ds;
+    private final Relation relation;
 
     /** user input is matched against this list of auto completion items */
@@ -21 +23 @@
 
     /**
-     * constructor
+     * Constructs a new {@code MemberRoleCellEditor}.
+     * @param ds the data set. Must not be null
+     * @param relation the relation. Can be null
      */
-    public MemberRoleCellEditor(DataSet ds) {
+    public MemberRoleCellEditor(DataSet ds, Relation relation) {
         this.ds = ds;
+        this.relation = relation;
         editor = new AutoCompletingTextField();
         editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
@@ -31 +36 @@
     }
 
-    /**
-     * replies the table cell editor
-     */
     @Override
     public Component getTableCellEditorComponent(JTable table,
@@ -41 +43 @@
         editor.setText(role);
         autoCompletionList.clear();
-        ds.getAutoCompletionManager().populateWithMemberRoles(autoCompletionList);
+        ds.getAutoCompletionManager().populateWithMemberRoles(autoCompletionList, relation);
         return editor;
     }

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 {

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
 
 public class MemberTableColumnModel extends DefaultTableColumnModel {
 
-    public MemberTableColumnModel(DataSet ds) {
+    /**
+     * Constructs a new {@code MemberTableColumnModel}.
+     * @param ds the data set. Must not be null
+     * @param relation the relation. Can be null
+     */
+    public MemberTableColumnModel(DataSet ds, Relation relation) {
         TableColumn col = null;
 
@@ -20 +26 @@
         col.setPreferredWidth(100);
         col.setCellRenderer(new MemberTableRoleCellRenderer());
-        col.setCellEditor(new MemberRoleCellEditor(ds));
+        col.setCellEditor(new MemberRoleCellEditor(ds, relation));
         addColumn(col);