Changeset 612 in josm for trunk

Timestamp:

2008-04-18T00:59:07+02:00 (16 years ago)

Author:

framm

Message:

• fix memory leaks described in ticket #432, patch by <Petr.Nejedly@…>

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadGpsTask.java (modified) (2 diffs)
• gui/SelectionManager.java (modified) (2 diffs)

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

@@ -68 +68 @@
         }
 
+                dialog = null;
                 dlg.dispose();
         }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -26 +26 @@
                 private final boolean newLayer;
 
-                public Task(boolean newLayer, BoundingBoxDownloader reader, DownloadAction action) {
+                public Task(boolean newLayer, BoundingBoxDownloader reader) {
                         super(tr("Downloading GPS data"));
                         this.reader = reader;
@@ -70 +70 @@
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
+                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
                 Main.worker.execute(task);
         }

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

@@ -127 +127 @@
                 eventSource.addMouseMotionListener(this);
                 selectionEndedListener.addPropertyChangeListener(this);
-                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "SelectionManager");
-        Main.contentPane.getActionMap().put("SelectionManager", new AbstractAction(){
-                        public void actionPerformed(ActionEvent e) {
-                                if (mousePos != null && mousePosStart != null)
-                                        paintRect();
-                                mousePosStart = null;
-                                mousePos = null;
-            }
-        });
         eventSource.addPropertyChangeListener("scale", new PropertyChangeListener(){
                         public void propertyChange(PropertyChangeEvent evt) {
@@ -155 +146 @@
                 eventSource.removeMouseMotionListener(this);
                 selectionEndedListener.removePropertyChangeListener(this);
-                Main.contentPane.getInputMap().remove(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
-                Main.contentPane.getActionMap().remove("SelectionManager");
         }