Changeset 3450 in josm

Timestamp:

Aug 20, 2010 9:56:22 PM (3 years ago)

Author:

bastiK

Message:

Purge+Clear Undo/Redo should free memory - remove references by clearing selection history

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PurgeAction.java (modified) (1 diff)
• gui/MapFrame.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (2 diffs)

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

@@ -174 +174 @@
         if (cbClearUndoRedo.isSelected()) {
             Main.main.undoRedo.clean();
+            Main.map.selectionListDialog.clearSelectionHistory();
         }
     }

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

@@ -76 +76 @@
     public ConflictDialog conflictDialog;
     public FilterDialog filterDialog;
-    /**
-     * The dialog that shows all relations and lets the user edit them.
-     */
     public RelationListDialog relationListDialog;
+    public SelectionListDialog selectionListDialog;
     /**
      * The panel list of all toggle dialog icons. To add new toggle dialog actions, use addToggleDialog
@@ -157 +155 @@
         addToggleDialog(LayerListDialog.getInstance());
         addToggleDialog(new PropertiesDialog(this));
-        addToggleDialog(new SelectionListDialog());
+        addToggleDialog(selectionListDialog = new SelectionListDialog());
         addToggleDialog(relationListDialog = new RelationListDialog());
         addToggleDialog(new CommandStackDialog(this));

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

@@ -221 +221 @@
     }
 
+    public void clearSelectionHistory() {
+        model.clearSelectionHistory();
+    }
+
     /**
      * Responds to double clicks on the list of selected objects
@@ -542 +546 @@
         public List<Collection<? extends OsmPrimitive>> getSelectionHistory() {
             return history;
+        }
+
+        public void clearSelectionHistory() {
+            history.clear();
         }