Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 3301) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 3302) @@ -52,4 +52,5 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; +import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; @@ -337,5 +338,5 @@ Main.map.mapView.getEditLayer(), relation, - (Collection) membershipData.getValueAt(row, 1) ).setVisible(true); + ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true); } @@ -472,4 +473,14 @@ private final JLabel selectSth = new JLabel("

" + tr("Please select the objects you want to change properties for.") + "

"); + + class MemberInfo { + List role = new ArrayList(); + List position = new ArrayList(); + void add(RelationMember r, Integer p) + { + role.add(r); + position.add(p); + } + } /** @@ -511,5 +522,5 @@ // setting up the membership table - membershipData.setColumnIdentifiers(new String[]{tr("Member Of"),tr("Role")}); + membershipData.setColumnIdentifiers(new String[]{tr("Member Of"),tr("Role"),tr("Position")}); membershipTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); membershipTable.addMouseListener(new PopupMenuLauncher() { @@ -528,5 +539,6 @@ }); - membershipTable.getColumnModel().getColumn(0).setCellRenderer(new DefaultTableCellRenderer() { + TableColumnModel mod = membershipTable.getColumnModel(); + mod.getColumn(0).setCellRenderer(new DefaultTableCellRenderer() { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -544,5 +556,5 @@ }); - membershipTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer() { + mod.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() { @SuppressWarnings("unchecked") @Override public Component getTableCellRendererComponent(JTable table, Object value, @@ -552,8 +564,8 @@ if (c instanceof JLabel) { JLabel label = (JLabel)c; - Collection col = (Collection) value; + MemberInfo col = (MemberInfo) value; String text = null; - for (RelationMember r : col) { + for (RelationMember r : col.role) { if (text == null) { text = r.getRole(); @@ -573,4 +585,33 @@ } }); + + mod.getColumn(2).setCellRenderer(new DefaultTableCellRenderer() { + @SuppressWarnings("unchecked") + @Override public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column); + boolean isFiltered = (((Relation)table.getValueAt(row, 0))).isFiltered(); + if (c instanceof JLabel) { + JLabel label = (JLabel)c; + MemberInfo col = (MemberInfo) table.getValueAt(row, 1); + + String text = ""; + for (Integer p : col.position) { + if (text.length() != 0) + text += ","; + text += String.valueOf(p); + } + + label.setText(text); + if (isFiltered) { + label.setFont(label.getFont().deriveFont(Font.ITALIC)); + } + } + return c; + } + }); + mod.getColumn(2).setPreferredWidth(20); + mod.getColumn(1).setPreferredWidth(40); + mod.getColumn(0).setPreferredWidth(200); // combine both tables and wrap them in a scrollPane @@ -803,15 +844,17 @@ membershipData.setRowCount(0); - Map> roles = new HashMap>(); + Map roles = new HashMap(); for (OsmPrimitive primitive: newSelection) { for (OsmPrimitive ref: primitive.getReferrers()) { if (ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted()) { Relation r = (Relation) ref; - Collection members = new ArrayList(); - roles.put(r, members); + MemberInfo mi = mi = new MemberInfo(); + roles.put(r, mi); + int i = 1; for (RelationMember m : r.getMembers()) { if (m.getMember() == primitive) { - members.add(m); + mi.add(m, i); } + ++i; } }