Changeset 1015 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2008-10-05T11:21:12+02:00 (16 years ago)

Author:

stoecker

Message:

separated display URL and shown URL in downloader

File:

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

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

@@ -41 +41 @@
                         new JTextField(11) };
         final JTextArea osmUrl = new JTextArea();
+        final JLabel showUrl = new JLabel();
         String noteUrl = tr("You can paste an URL here to download the area.");
-        String oldUrl = "";
         
         final JLabel sizeCheck = new JLabel();
@@ -84 +84 @@
                         public void removeUpdate(DocumentEvent e) { dowork(); }
                         private void dowork() {
-                                if(!oldUrl.equals(osmUrl.getText()))
-                                {
-                                        Bounds b = osmurl2bounds(osmUrl.getText());
-                                        if (b != null) {
-                                                gui.minlon = b.min.lon();
-                                                gui.minlat = b.min.lat();
-                                                gui.maxlon = b.max.lon();
-                                                gui.maxlat = b.max.lat();
-                                                gui.boundingBoxChanged(BoundingBoxSelection.this);
-                                                updateBboxFields(gui);
-                                                updateSizeCheck(gui);
-                                                oldUrl = osmUrl.getText();
-                                        }
+                                Bounds b = osmurl2bounds(osmUrl.getText());
+                                if (b != null) {
+                                        gui.minlon = b.min.lon();
+                                        gui.minlat = b.min.lat();
+                                        gui.maxlon = b.max.lon();
+                                        gui.maxlat = b.max.lat();
+                                        gui.boundingBoxChanged(BoundingBoxSelection.this);
+                                        updateBboxFields(gui);
+                                        updateSizeCheck(gui);
                                 }
                         }
@@ -132 +128 @@
                 dlg.add(new JLabel(tr("URL from www.openstreetmap.org")), GBC.eol().insets(10,20,5,0));
                 dlg.add(osmUrl, GBC.eop().insets(10,0,5,0).fill());
+                dlg.add(showUrl, GBC.eop().insets(10,0,5,20));
                 dlg.add(sizeCheck, GBC.eop().insets(10,0,5,20));
 
@@ -169 +166 @@
                         zoom++;
                 }
-                // setting old URL prevents refresh based on this URL
-                oldUrl = noteUrl+"\n"+"http://www.openstreetmap.org/index.html?mlat="+lat+"&mlon="+lon+"&zoom="+zoom;
-                osmUrl.setText(oldUrl);
+                showUrl.setText("http://www.openstreetmap.org/index.html?mlat="+lat+"&mlon="+lon+"&zoom="+zoom);
         }