Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

Timestamp:

27.10.2009 01:21:32 (3 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

• trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 
 import javax.swing.DefaultListModel;
@@ -42 +39 @@
 
         JPanel dlg = new JPanel(new GridBagLayout());
-        gui.tabpane.addTab(tr("Bookmarks"), dlg);
+        gui.addDownloadAreaSelector(dlg, tr("Bookmarks"));
 
         bookmarks = new BookmarkList();
@@ -49 +46 @@
                 Preferences.Bookmark b = (Preferences.Bookmark)bookmarks.getSelectedValue();
                 if (b != null) {
-                    gui.minlat = b.latlon[0];
-                    gui.minlon = b.latlon[1];
-                    gui.maxlat = b.latlon[2];
-                    gui.maxlon = b.latlon[3];
-                    gui.boundingBoxChanged(BookmarkSelection.this);
+                    gui.boundingBoxChanged(b.asBounds(),BookmarkSelection.this);
                 }
             }
@@ -108 +101 @@
 
     public void boundingBoxChanged(DownloadDialog gui) {
-        tempBookmark = new Preferences.Bookmark();
-        tempBookmark.latlon[0] = gui.minlat;
-        tempBookmark.latlon[1] = gui.minlon;
-        tempBookmark.latlon[2] = gui.maxlat;
-        tempBookmark.latlon[3] = gui.maxlon;
+        tempBookmark = new Preferences.Bookmark(gui.getSelectedDownloadArea());
         bookmarks.clearSelection();
     }