Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 610) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 611) @@ -1,3 +1,4 @@ -// License: GPL. Copyright 2007 by Immanuel Scholz and others +// License: GPL. See LICENSE file for details. + package org.openstreetmap.josm.gui.dialogs; @@ -29,8 +30,10 @@ import javax.swing.Box; import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JLabel; +import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -112,4 +115,5 @@ } + private final Map> valueCount = new TreeMap>(); /** * Edit the value in the properties table row @@ -118,4 +122,5 @@ void propertyEdit(int row) { String key = propertyData.getValueAt(row, 0).toString(); + objKey=key; Collection sel = Main.ds.getSelected(); if (sel.isEmpty()) { @@ -143,14 +148,26 @@ final AutoCompleteComboBox values = new AutoCompleteComboBox(); + values.setRenderer(new DefaultListCellRenderer() { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + if (c instanceof JLabel) { + String str = null; + str=(String) value; + if (valueCount.containsKey(objKey)){ + Map m=valueCount.get(objKey); + if (m.containsKey(str)) { + str+="("+m.get(str)+")"; + c.setFont(c.getFont().deriveFont(Font.ITALIC+Font.BOLD)); + } + } + ((JLabel)c).setText(str); + } + return c; + } + }); values.setEditable(true); - Collection newItems; - if (allData.containsKey(key)) { - newItems = allData.get(key); - } else { - newItems = Collections.emptyList(); - } - values.setPossibleItems(newItems); - values.setSelectedItem(null); - final String selection= ((JComboBox)propertyData.getValueAt(row, 1)).getEditor().getItem().toString(); + updateListData(key, allData, values); + Map m=(Map)propertyData.getValueAt(row, 1); + final String selection= m.size()!=1?"":m.entrySet().iterator().next().getKey(); values.setSelectedItem(selection); values.getEditor().setItem(selection); @@ -158,5 +175,5 @@ p.add(Box.createHorizontalStrut(10), GBC.std()); p.add(values, GBC.eol().fill(GBC.HORIZONTAL)); - addFocusAdapter(allData, keys, values); + addFocusAdapter(row, allData, keys, values); final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) { @@ -203,7 +220,23 @@ } - selectionChanged(sel); // update whole table + selectionChanged(sel); // update whole table Main.parent.repaint(); // repaint all - drawing could have been changed } + + /** + * @param row + * @param key + * @param allData + * @param values + */ + private void updateListData(String key, final TreeMap> allData, final AutoCompleteComboBox values) { + Collection newItems; + if (allData.containsKey(key)) { + newItems = allData.get(key); + } else { + newItems = Collections.emptyList(); + } + values.setPossibleItems(newItems); + } /** @@ -246,4 +279,5 @@ p2.add(values, BorderLayout.CENTER); + addFocusAdapter(-1, allData, keys, values); JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ @Override public void selectInitialValue() { @@ -269,7 +303,5 @@ * @param values */ - private void addFocusAdapter( - final TreeMap> allData, - final AutoCompleteComboBox keys, final AutoCompleteComboBox values) { + private void addFocusAdapter(final int row, final TreeMap> allData,final AutoCompleteComboBox keys, final AutoCompleteComboBox values) { // get the combo box' editor component JTextComponent editor = (JTextComponent)values.getEditor() @@ -279,15 +311,10 @@ @Override public void focusGained(FocusEvent e) { String key = keys.getEditor().getItem().toString(); - Collection newItems; - if (allData.containsKey(key)) { - newItems = allData.get(key); - } else { - newItems = Collections.emptyList(); - } - values.setPossibleItems(newItems); + updateListData(key, allData, values); + objKey=key; } }); } - + private String objKey; /** * @return @@ -334,5 +361,5 @@ } @Override public Class getColumnClass(int columnIndex) { - return columnIndex == 1 ? Relation.class : String.class; + return String.class; } }; @@ -402,8 +429,20 @@ Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column); if (c instanceof JLabel) { - String str = ((JComboBox) value).getEditor().getItem().toString(); + String str = null; + switch (column) { + case 0: + str = (String) value; + break; + case 1: + Map v = (Map) value; + if (v.size()!=1) { + str=""; + c.setFont(c.getFont().deriveFont(Font.ITALIC)); + } else { + str=v.entrySet().iterator().next().getKey(); + } + break; + } ((JLabel)c).setText(str); - if (str.equals(tr(""))) - c.setFont(c.getFont().deriveFont(Font.ITALIC)); } return c; @@ -498,22 +537,29 @@ propertyData.setRowCount(0); - Map valueCount = new HashMap(); - TreeMap> props = new TreeMap>(); + Map keyCount = new HashMap(); + valueCount.clear(); for (OsmPrimitive osm : newSelection) { for (Entry e : osm.entrySet()) { - Collection value = props.get(e.getKey()); - if (value == null) { - value = new TreeSet(); - props.put(e.getKey(), value); - } - value.add(e.getValue()); - valueCount.put(e.getKey(), valueCount.containsKey(e.getKey()) ? valueCount.get(e.getKey())+1 : 1); - } - } - for (Entry> e : props.entrySet()) { - JComboBox value = new JComboBox(e.getValue().toArray()); - value.setEditable(true); - value.getEditor().setItem(e.getValue().size() > 1 || valueCount.get(e.getKey()) != newSelection.size() ? tr("") : e.getValue().iterator().next()); - propertyData.addRow(new Object[]{e.getKey(), value}); + keyCount.put(e.getKey(), keyCount.containsKey(e.getKey()) ? keyCount.get(e.getKey())+1 : 1); + if (valueCount.containsKey(e.getKey())) { + Map v = valueCount.get(e.getKey()); + v.put(e.getValue(), v.containsKey(e.getValue())? v.get(e.getValue())+1 : 1 ); + } else { + TreeMap v = new TreeMap(); + v.put(e.getValue(), 1); + valueCount.put(e.getKey(), v); + } + } + } + for (Entry> e : valueCount.entrySet()) { + int count=0; + for (Entry e1: e.getValue().entrySet()) { +// System.out.println(e.getKey()+" Entry "+e1.getKey()+" value "+e1.getValue()); + count+=e1.getValue(); + } + if (count < newSelection.size()) { + e.getValue().put("", newSelection.size()-count); + } + propertyData.addRow(new Object[]{e.getKey(), e.getValue()}); } @@ -536,5 +582,5 @@ } value.add(m.role); - valueCountM.put(r, valueCount.containsKey(r) ? valueCount.get(r)+1 : 1); + valueCountM.put(r, keyCount.containsKey(r) ? keyCount.get(r)+1 : 1); } }