Changeset 86 in josm for src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
- Timestamp:
- 2006-04-21T14:31:51+02:00 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r79 r86 36 36 37 37 import org.openstreetmap.josm.Main; 38 import org.openstreetmap.josm.command.Change KeyValueCommand;38 import org.openstreetmap.josm.command.ChangePropertyCommand; 39 39 import org.openstreetmap.josm.data.SelectionChangedListener; 40 40 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 68 68 */ 69 69 public class DblClickWatch extends MouseAdapter { 70 @Override 71 public void mouseClicked(MouseEvent e) { 70 @Override public void mouseClicked(MouseEvent e) { 72 71 if (e.getClickCount() < 2) 73 72 return; … … 87 86 void edit(int row) { 88 87 String key = data.getValueAt(row, 0).toString(); 89 Collection<OsmPrimitive> sel = Main. main.ds.getSelected();88 Collection<OsmPrimitive> sel = Main.ds.getSelected(); 90 89 String msg = "<html>This will change "+sel.size()+" object"+(sel.size()==1?"":"s")+".<br><br>"+ 91 90 "Please select a new value for '"+key+"'.<br>(Empty string deletes the key.)"; … … 125 124 if (value.equals("")) 126 125 value = null; // delete the key 127 mv.editLayer().add(new Change KeyValueCommand(sel, key, value));126 mv.editLayer().add(new ChangePropertyCommand(sel, key, value)); 128 127 129 128 if (value == null) … … 138 137 */ 139 138 void add() { 140 Collection<OsmPrimitive> sel = Main. main.ds.getSelected();139 Collection<OsmPrimitive> sel = Main.ds.getSelected(); 141 140 142 141 JPanel p = new JPanel(new BorderLayout()); … … 144 143 "Please select a key"), BorderLayout.NORTH); 145 144 Vector<String> allKeys = new Vector<String>(); 146 for (OsmPrimitive osm : Main. main.ds.allNonDeletedPrimitives())145 for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) 147 146 allKeys.addAll(osm.keySet()); 148 147 for (Iterator<String> it = allKeys.iterator(); it.hasNext();) { … … 172 171 if (value.equals("")) 173 172 return; 174 mv.editLayer().add(new Change KeyValueCommand(sel, key, value));173 mv.editLayer().add(new ChangePropertyCommand(sel, key, value)); 175 174 selectionChanged(sel); // update table 176 175 } … … 182 181 private void delete(int row) { 183 182 String key = data.getValueAt(row, 0).toString(); 184 Collection<OsmPrimitive> sel = Main. main.ds.getSelected();185 mv.editLayer().add(new Change KeyValueCommand(sel, key, null));183 Collection<OsmPrimitive> sel = Main.ds.getSelected(); 184 mv.editLayer().add(new ChangePropertyCommand(sel, key, null)); 186 185 selectionChanged(sel); // update table 187 186 } … … 191 190 */ 192 191 private final DefaultTableModel data = new DefaultTableModel(){ 193 @Override 194 public boolean isCellEditable(int row, int column) { 192 @Override public boolean isCellEditable(int row, int column) { 195 193 return false; 196 194 } 197 @Override 198 public Class<?> getColumnClass(int columnIndex) { 195 @Override public Class<?> getColumnClass(int columnIndex) { 199 196 return columnIndex == 1 ? JComboBox.class : String.class; 200 197 } … … 221 218 propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); 222 219 propertyTable.setDefaultRenderer(JComboBox.class, new DefaultTableCellRenderer(){ 223 @Override 224 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { 220 @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { 225 221 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column); 226 222 if (c instanceof JLabel) { … … 234 230 }); 235 231 propertyTable.setDefaultRenderer(String.class, new DefaultTableCellRenderer(){ 236 @Override 237 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { 232 @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { 238 233 return super.getTableCellRendererComponent(table, value, isSelected, false, row, column); 239 234 } … … 279 274 } 280 275 281 @Override 282 public void setVisible(boolean b) { 276 @Override public void setVisible(boolean b) { 283 277 if (b) { 284 Main. main.ds.addSelectionChangedListener(this);285 selectionChanged(Main. main.ds.getSelected());278 Main.ds.addSelectionChangedListener(this); 279 selectionChanged(Main.ds.getSelected()); 286 280 } else { 287 Main. main.ds.removeSelectionChangedListener(this);281 Main.ds.removeSelectionChangedListener(this); 288 282 } 289 283 super.setVisible(b); … … 291 285 292 286 public void selectionChanged(Collection<OsmPrimitive> newSelection) { 287 if (propertyTable == null) 288 return; // selection changed may be received in base class constructor before init 293 289 if (propertyTable.getCellEditor() != null) 294 290 propertyTable.getCellEditor().cancelCellEditing();
Note:
See TracChangeset
for help on using the changeset viewer.