Ticket #1478: PropDiag.patch
File PropDiag.patch, 2.7 KB (added by , 16 years ago) |
---|
-
trunk\src\org\openstreetmap\josm\gui\dialogs\PropertiesDialog.java
old new 18 18 import java.awt.event.KeyEvent; 19 19 import java.awt.event.MouseAdapter; 20 20 import java.awt.event.MouseEvent; 21 import java.lang.String; 21 22 import java.util.Collection; 22 23 import java.util.Collections; 23 24 import java.util.HashMap; … … 207 208 return; 208 209 } 209 210 210 String value = values.getEditor().getItem().toString() ;211 String value = values.getEditor().getItem().toString().trim(); 211 212 // is not Java 1.5 212 213 //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); 213 214 if (value.equals("")) 214 215 value = null; // delete the key 215 String newkey = keys.getEditor().getItem().toString() ;216 String newkey = keys.getEditor().getItem().toString().trim(); 216 217 //newkey = java.text.Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC); 217 218 if (newkey.equals("")) { 218 219 newkey = key; … … 258 259 Main.ds.fireSelectionChanged(sel); 259 260 selectionChanged(sel); // update whole table 260 261 Main.parent.repaint(); // repaint all - drawing could have been changed 262 263 if(!key.equals(newkey)) { 264 for(int i=0; i < propertyTable.getRowCount(); i++) 265 if(propertyData.getValueAt(i, 0).toString() == newkey) { 266 row=i; 267 break; 268 } 269 } 270 propertyTable.changeSelection(row, 0, false, false); 261 271 } 262 272 263 273 /** … … 325 335 pane.createDialog(Main.parent, tr("Change values?")).setVisible(true); 326 336 if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) 327 337 return; 328 String key = keys.getEditor().getItem().toString() ;329 String value = values.getEditor().getItem().toString() ;338 String key = keys.getEditor().getItem().toString().trim(); 339 String value = values.getEditor().getItem().toString().trim(); 330 340 if (value.equals("")) 331 341 return; 332 342 if (key.equals("created_by")) … … 391 401 Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, null)); 392 402 Main.ds.fireSelectionChanged(sel); 393 403 selectionChanged(sel); // update table 404 405 int nextRow = row < propertyTable.getRowCount() ? row : propertyTable.getRowCount()-1; 406 propertyTable.changeSelection(nextRow, 0, false, false); 394 407 } 395 408 396 409 /** … … 702 715 setTitle(tr("Properties / Memberships"), false); 703 716 } 704 717 705 718 } 706 719 }