Changeset 14251 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2018-09-16T01:46:08+02:00 (6 years ago)

Author:

Don-vip

Message:

fix memory leaks after upload, validation and primitives combining

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -539 +539 @@
                 dialog.setVisible(true);
                 if (!dialog.isApplied()) {
+                    dialog.dispose();
                     return new UserCancelException();
                 }
@@ -547 +548 @@
                     cmds.addAll(dialog.buildResolutionCommands());
                 }
+                dialog.dispose();
                 return null;
             });
@@ -632 +634 @@
         return tr("{0} ({1})", key, values);
     }
+
+    @Override
+    public void dispose() {
+        setTargetPrimitive(null, false);
+        super.dispose();
+    }
 }