Changeset 28 in josm for src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2005-11-30T21:40:09+01:00 (19 years ago)

Author:

imi

Message:

• fixed bug: second layer does not get the pending line segments of the first
• fixed bug: property page edit action "cancel" effect the display of the table
• data entries with same id now same data

File:

• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (1 diff)

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -108 +108 @@
                         }
                 });
+                String oldComboEntry = combo.getEditor().getItem().toString();
                 dlg.setVisible(true);
 
                 Object answer = optionPane.getValue();
                 if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE ||
-                                (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION))
+                                (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) {
+                        combo.getEditor().setItem(oldComboEntry);
                         return;
+                }
 
                 String value = combo.getEditor().getItem().toString();