Changeset 7293 in josm for trunk/src

Timestamp:

2014-07-07T18:40:16+02:00 (10 years ago)

Author:

akks

Message:

Fix resource leaks when closing map in Lasso mode, see #10104

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/LassoModeAction.java (modified) (2 diffs)
• gui/util/AdvancedKeyPressDetector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -35 +36 @@
         super.exitMode();
     }
+
+    @Override
+    public boolean layerIsSupported(Layer l) {
+        return Main.map.mapModeSelect.layerIsSupported(l);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -98 +98 @@
         }
         if (!modifierListeners.isEmpty()) {
-            Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), modifierListeners.toString());
+            Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
         }
         try {
@@ -160 +160 @@
      */
     public boolean isKeyPressed(int keyCode) {
-        return set.contains(Integer.valueOf(keyCode));
+        return set.contains(keyCode);
     }
 }