Changeset 14669 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-01-10T06:31:46+01:00 (6 years ago)

Author:

GerdP

Message:

see #13160: Avoid additional deadlocks caused by r13854 (13160-v2.patch)

This probably doesn't fix #13160 but it seems to be a good step forward.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (6 diffs)

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

@@ -27 +27 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.AbstractAction;
@@ -1098 +1099 @@
      */
     class AddAction extends JosmAction {
+        AtomicBoolean isPerforming = new AtomicBoolean(false);
         AddAction() {
             super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"),
@@ -1105 +1107 @@
 
         @Override
-        public synchronized void actionPerformed(ActionEvent e) {
-            if (!isEnabled())
+        public void actionPerformed(ActionEvent e) {
+            if (isPerforming.get())
                 return;
-            setEnabled(false);
+            isPerforming.set(true);
             try {
                 editHelper.addTag();
                 btnAdd.requestFocusInWindow();
             } finally {
-                setEnabled(true);
+                isPerforming.set(false);
             }
         }
@@ -1122 +1124 @@
      */
     class EditAction extends JosmAction implements ListSelectionListener {
+        AtomicBoolean isPerforming = new AtomicBoolean(false);
         EditAction() {
             super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"),
@@ -1130 +1133 @@
 
         @Override
-        public synchronized void actionPerformed(ActionEvent e) {
-            if (!isEnabled())
+        public void actionPerformed(ActionEvent e) {
+            if (isPerforming.get())
                 return;
-            setEnabled(false);
+            isPerforming.set(true);
             try {
                 if (tagTable.getSelectedRowCount() == 1) {
@@ -1143 +1146 @@
                 }
             } finally {
-                setEnabled(true);
+                isPerforming.set(false);
             }
         }