Changeset 2032 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-09-03T09:29:22+02:00 (15 years ago)

Author:

stoecker

Message:

fix #3377 - patch by xeen - removed deprecated calls

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ConditionalOptionPaneUtil.java (modified) (1 diff)
• dialogs/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -27 +27 @@
  * 
  */
-public class ConditionalOptionPaneUtil {
+@Deprecated public class ConditionalOptionPaneUtil {
     static public final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE;
 

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

@@ -636 +636 @@
         }
 
-        LinkedList<TaggingPreset> p = new LinkedList<TaggingPreset>();
         presets.removeAll();
         int total = nodes+ways+relations+closedways;
@@ -831 +830 @@
         protected void deleteFromRelation(int row) {
             Relation cur = (Relation)membershipData.getValueAt(row, 0);
-            int result = new ExtendedDialog(Main.parent,
+
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Change relation"),
-                    tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())),
-                    new String[] {tr("Delete from relation"), tr("Cancel")},
-                    new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
-
-            if(result != 1)
+                    new String[] {tr("Delete from relation"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
+            ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
+            ed.showDialog();
+
+            if(ed.getValue() != 1)
                 return;